合并

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

@@ -177,7 +177,7 @@ public class TaUser implements Serializable {
      * 前台传值城市
      */
     @TableField(exist = false)
-    private ArrayList<Integer> selectCityTree;
+    private ArrayList<String> selectCityTree;
 
     /**
      * 城市ID

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

@@ -167,7 +167,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	}
 
 	// 维护公司所在城市
-	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
+	public void addAndupdate(ArrayList<String> selectCityTree,boolean isA,Integer orgid){
 			// 查询当前所有的市
 			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
 			tdCityQuery.eq("leveltype",2);
@@ -181,11 +181,11 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		}
 		TaOrgCity  taOrgCity = new TaOrgCity();
 			 // 对比现在的城市ID
-			 for(Integer city:selectCityTree){
+			 for(String city:selectCityTree){
 				for (TdCity tdCity : tdCityList){
 						// 入库城市
-					if (city.equals(tdCity.getId())){
-						taOrgCity.setCityId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+					if (city.equals(String.valueOf(tdCity.getId()))){
+						taOrgCity.setCityId(Integer.valueOf(city)).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
 						taOrgCityMapper.insert(taOrgCity);
 						// 查询当前公司选择省份是否存在
                        QueryWrapper<TaOrgCity> taOrgCityParent = new QueryWrapper<>();
@@ -205,9 +205,9 @@ 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)) {
+	public void  verificationCity(ArrayList<String> selectCityTree,Integer city)throws Exception{
+		for (String id: selectCityTree) {
+			if (id.equals(String.valueOf(city))) {
 				return;
 				}
 			}
@@ -241,7 +241,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taUser.setMiniapp(taMiniapp);
 		taUser.setLoginPassword(null);
 		// 查询所有城市id
-		ArrayList<Integer> taOrgCityList= taOrgCityMapper.selectByIdCity(taUser.getOrgId());
+		ArrayList<String> taOrgCityList= taOrgCityMapper.selectByIdCity(taUser.getOrgId());
 		taUser.setSelectCityTree(taOrgCityList);
 		return taUser;
 	}

src/main/java/com/huiju/estateagents/mapper/TaOrgCityMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Mapper
 public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
     // 查询所有的城市排除省份
-    ArrayList<Integer> selectByIdCity(@Param("orgId") Integer orgId);
+    ArrayList<String> selectByIdCity(@Param("orgId") Integer orgId);
 
     /**
      * 根据orgid查询城市并排除省份

src/main/resources/mapper/TaOrgCity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaOrgCityMapper">
-    <select id="selectByIdCity"  resultType="int">
+    <select id="selectByIdCity"  resultType="string">
         select city_id from ta_org_city where  parentid != 100000 and  org_id = #{orgId}
     </select>