Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideModuleDictServiceImpl.java

@@ -126,10 +126,11 @@ public class GuideModuleDictServiceImpl extends BaseServiceImpl<GuideModuleDictD
             List<GuideModuleDictDefaultDTO> defaultList =  guideModuleDictDefaultService.getList();
             List<GuideModuleDictEntity> moduleList = ConvertUtils.sourceToTarget(defaultList, GuideModuleDictEntity.class);
             moduleList.forEach(item -> {
+                item.setId(null);
                 item.setCustomerId(customerId);
             });
             insertBatch(moduleList);
-            list = baseDao.selectList(wrapper);
+            list = moduleList;
         }
         return list.stream().map(item -> {
             ModuleDTO dto = new ModuleDTO();

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java

@@ -101,6 +101,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
             throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_COMMENT.getCode(), "当前活动已取消,不能评论");
         }
         //2、评论内容审核
+        if(StringUtils.isNotBlank(formDTO.getCommentContent())){
             TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
             TextTaskDTO taskDTO = new TextTaskDTO();
             taskDTO.setContent(formDTO.getCommentContent());
@@ -114,6 +115,7 @@ public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCom
                     throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
                 }
             }
+        }
         //图片安全校验
         if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(formDTO.getImageList())){
             List<String> imageList = formDTO.getImageList().stream().map(NoticeFileDTO::getUrl).collect(Collectors.toList());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -180,6 +180,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         }*/
         userIdList.forEach(id -> {
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
+            if(null!=baseInfo){
                 //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里
                 //if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){
                 if (StringUtils.isNotBlank(baseInfo.getStreet()) && StringUtils.isNotBlank(baseInfo.getSurname())) {
@@ -199,6 +200,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                 }
                 userBaseInfoList.add(baseInfo);
                 //}
+            }else{
+                logger.error(String.format("userId【%s】,构造UserBaseInfoResultDTO为空",id));
+            }
+
         });
         return userBaseInfoList;
     }