合并

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

@@ -166,30 +166,42 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return taUser;
 	}
 
+	// 维护公司所在城市
 	// 维护公司所在城市
 	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
-
-			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
-			tdCityQuery.eq("leveltype",1);
-			 List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
+		// 查询当前所有的市
+		QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
+		tdCityQuery.eq("leveltype",2);
+		List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
 
 		// isA=true删除所有城市重新添加
 		if (isA == true){
-			for(Integer city:selectCityTree) {
-				taOrgCityMapper.deleteById(city);
-			}
+			QueryWrapper<TaOrgCity> taOrgCity= new  QueryWrapper<>();
+			taOrgCity.eq("org_id",orgid);
+			taOrgCityMapper.delete(taOrgCity);
 		}
-			 // 对比现在的城市ID
-			 for(Integer city:selectCityTree){
-				for (TdCity tdCity : tdCityList){
-					if (city.equals(tdCity.getId())){
-						TaOrgCity  taOrgCity = new TaOrgCity();
-						taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+		TaOrgCity  taOrgCity = new TaOrgCity();
+		// 对比现在的城市ID
+		for(Integer city:selectCityTree){
+			for (TdCity tdCity : tdCityList){
+				// 入库城市
+				if (city.equals(tdCity.getId())){
+					taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+					taOrgCityMapper.insert(taOrgCity);
+					// 查询当前公司选择省份是否存在
+					QueryWrapper<TaOrgCity> taOrgCityParent = new QueryWrapper<>();
+					taOrgCityParent.eq("id",tdCity.getParentid());
+					taOrgCityParent.eq("org_id",orgid);
+					TaOrgCity taOrgParent = taOrgCityMapper.selectOne(taOrgCityParent);
+					// 如果为空，查询行政表
+					if (null == taOrgParent){
+						TdCity  tdCityParent = tdCityMapper.selectById(tdCity.getParentid());
+						taOrgCity.setId(tdCityParent.getId()).setName(tdCityParent.getName()).setOrgId(orgid).setStatus(1).setParentid(100000);
+						taOrgCityMapper.insert(taOrgCity);
 					}
-
 				}
-			 }
-
+			}
+		}
 	}
 	// 判断当前城市是否存在
 	public void  verificationCity(ArrayList<Integer> selectCityTree,Integer city)throws Exception{