合并

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

         map.put("userId",taUser.getUserId().toString());
         map.put("orgId",taUser.getOrgId().toString());
         String token = JWTUtils.newTokenByMap(map);
-    
+
+        // 先尝试删除这个Token
+        // 因为偶尔出现了，Token插入失败，报的错就是主键重复
+        sysTokenService.removeById(token);
+
         //保存token
         sysTokenService.saveToken(token);
     

src/main/java/com/huiju/estateagents/controller/HelpActivityController.java

             map.put("postList",postList);
     
             QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
-            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            //tdPosterTemplateQueryWrapper.eq("org_id",orgId);
             tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             tdPosterTemplateQueryWrapper.eq("type",CommConstant.HELP_ACTIVITY);
             List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
             TaChannel channel = taChannelService.getOne(queryWrapper);
+            if (null == channel){
+                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+            }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
             taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

             map.put("postList",postList);
     
             QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
-            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            //tdPosterTemplateQueryWrapper.eq("org_id",orgId);
             tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             tdPosterTemplateQueryWrapper.eq("type",CommConstant.GROUP_ACTIVITY);
             List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.json.YamlJsonParser;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaDrainageRecordService iTaDrainageRecordService;
+
     /**
      * 分页查询列表
      * @param pageNum
      */
     @ResponseBody
     @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taDrainageDelete(@PathVariable Integer id){
+    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            // 判断是否产生业务数据
+            TaDrainage drainage = iTaDrainageService.getById(id);
+            if (null != drainage.getEnlistNum() && drainage.getEnlistNum().intValue() > 0) {
+                responseBean.addError("此H5项目已有用户提交数据，删除项目会删除全部数据，且已发布H5页面再提交内容会报错，不建议删除数据。可以点击项目名称修改截止时间为过去时间来禁用项目。");
+                return responseBean;
+            }
+
             if(iTaDrainageService.removeById(id)){
                 responseBean.addSuccess("success");
             }else {

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

             QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
             buildingIdQueryWrapper.eq("org_id", orgId);
+            building.setName(building.getBuildingName());
             taBuildingMapper.update(building,buildingIdQueryWrapper);
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);
+        building.setName(building.getBuildingName());
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }