合并

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -184,4 +184,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Integer cityId;
+
+    /**
+     * 默认城市
+     */
+    @TableField(exist = false)
+    private Integer defaultCityId;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -100,6 +100,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setLoginName(taUser.getPhone());
 		}
 
+		//判断默认城市是否在维护城市内
+		verificationCity(taUser.getSelectCityTree(),taUser.getDefaultCityId());
+
 		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
 		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
 		List<TaUser> taUserList = this.list(wrapper);
@@ -188,7 +191,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			 }
 
 	}
-
+	// 判断当前城市是否存在
+	public void  verificationCity(ArrayList<Integer> selectCityTree,Integer city)throws Exception{
+		for (Integer id: selectCityTree) {
+			if (id.equals(city)) {
+				return;
+			}
+		}
+		throw new Exception("当前默认城市不在维护城市内");
+	}
 	@Override
 	public TaUser getInfoWithOrg(Integer id) {
 		TaUser taUser = this.getById(id);
@@ -201,7 +212,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
 			taUser.setOrgNum(taOrg.getBuildingNum());
-			taOrg.setDefaultCityId(taUser.getCityId());
+			taUser.setDefaultCityId(taUser.getCityId());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -221,11 +232,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Override
 	public void updateInfoWithOrg(TaUser taUser) throws Exception {
+		//判断默认城市是否在维护城市内
+		verificationCity(taUser.getSelectCityTree(),taUser.getDefaultCityId());
+
 		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
 			taOrg.setBuildingNum(taUser.getOrgNum());
+			taOrg.setDefaultCityId(taUser.getDefaultCityId());
 
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");