分支比对提交 v3.5 -- v3.5.1

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

@@ -116,7 +116,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
 		taOrg.setBuildingNum(taUser.getOrgNum());
-		taOrg.setDefaultCityId(taUser.getCityId());
+		taOrg.setDefaultCityId(taUser.getDefaultCityId());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
@@ -168,23 +168,36 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	// 维护公司所在城市
 	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);
+			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);
 		}
+		TaOrgCity  taOrgCity = new 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());
+						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);
+						}
 					}
 
 				}
@@ -196,8 +209,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		for (Integer id: selectCityTree) {
 			if (id.equals(city)) {
 				return;
+				}
 			}
-		}
 		throw new Exception("当前默认城市不在维护城市内");
 	}
 	@Override
@@ -212,7 +225,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
 			taUser.setOrgNum(taOrg.getBuildingNum());
-			taUser.setDefaultCityId(taUser.getCityId());
+			taUser.setDefaultCityId(taOrg.getDefaultCityId());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -227,6 +240,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		taUser.setMiniapp(taMiniapp);
 		taUser.setLoginPassword(null);
+		// 查询所有城市id
+		ArrayList<Integer> taOrgCityList= taOrgCityMapper.selectByIdCity(taUser.getOrgId());
+		taUser.setSelectCityTree(taOrgCityList);
 		return taUser;
 	}
 
@@ -241,7 +257,6 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taOrg.setWaterMark(taUser.getWaterMark());
 			taOrg.setBuildingNum(taUser.getOrgNum());
 			taOrg.setDefaultCityId(taUser.getDefaultCityId());
-
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");
 			}

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

@@ -3,6 +3,10 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaOrgCity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
+    // 查询所有的城市排除省份
+    ArrayList<Integer> selectByIdCity(@Param("orgId") Integer orgId);
 }

src/main/resources/mapper/TaOrgCity.xml

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