合并

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

@@ -185,17 +185,17 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 				for (TdCity tdCity : tdCityList){
 						// 入库城市
 					if (city.equals(tdCity.getId())){
-						taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+						taOrgCity.setCityId(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("city_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);
+							taOrgCity.setCityId(tdCityParent.getId()).setName(tdCityParent.getName()).setOrgId(orgid).setStatus(1).setParentid(100000);
 							taOrgCityMapper.insert(taOrgCity);
 						}
 					}

src/main/java/com/huiju/estateagents/entity/TaOrgCity.java

@@ -24,11 +24,18 @@ import java.util.List;
 public class TaOrgCity implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 省份id
      * 城市id
      */
-    private Integer id;
+    private Integer cityId;
 
     /**
      * 省市区名称

src/main/resources/mapper/TaOrgCity.xml

@@ -2,6 +2,6 @@
 <!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 from ta_org_city where  parentid != 100000 and  org_id = #{orgId}
+        select city_id from ta_org_city where  parentid != 100000 and  org_id = #{orgId}
     </select>
 </mapper>