Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5

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

@@ -162,4 +162,10 @@ public class TaUser implements Serializable {
     
     @TableField(exist = false)
     private String buildingId;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+    @TableField(exist = false)
+    private int orgNum;
 }

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

@@ -104,6 +104,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setName(taUser.getOrgName());
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
+		taOrg.setOrgNum(taUser.getOrgNum());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
@@ -161,6 +162,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
+			taUser.setOrgNum(taOrg.getOrgNum());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -184,6 +186,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
+			taOrg.setOrgNum(taUser.getOrgNum());
 
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");

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

@@ -56,4 +56,9 @@ public class TaOrg implements Serializable {
     private LocalDateTime createDate;
 
     private String waterMark;
+
+    /**
+     * 最大数
+     */
+    private int orgNum;
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -81,6 +81,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private  TaOrgMapper  taOrgMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
@@ -290,6 +293,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Override
     public ResponseBean buildingAdd(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
+        // 根据orgId查询当前楼盘最大数
+        TaOrg taOrg = taOrgMapper.selectById(orgId);
+        // 查询当前org楼盘总数
+        QueryWrapper<TaBuilding>  taBuildingQuery = new QueryWrapper<>();
+        taBuildingQuery.eq("org_id",orgId);
+        taBuildingQuery.gt("status",-1);
+        int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
+        if (orgNum >= taOrg.getOrgNum()){
+            return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
         if(null!= object.getDate("openingDate")){