校验

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatHmServiceImpl.java

@@ -110,6 +110,9 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     @Override
     public GroupChatHmBO getById(Long hmId) {
         TabGroupChatHm hm = this.groupChatHmMapper.selectById(hmId);
+        if(null == hm) {
+            return null ;
+        }
         this.updateLinkCount(hm.getWxEnterpriseId(), hmId);
         GroupChatHmBO bo = EntityUtil.changeEntityByJSON(GroupChatHmBO.class, hm);
         return bo;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmLinkController.java

@@ -9,7 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.gic.haoban.manage.web.utils.statistics.DateUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -30,6 +29,7 @@ import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.constants.StatisticsApolloKeyConstant;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
+import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreDTO;
 import com.gic.haoban.manage.api.dto.hm.HmLinkStoreSettingDTO;
@@ -52,6 +52,7 @@ import com.gic.haoban.manage.web.qo.hm.data.HmLinkChartQO;
 import com.gic.haoban.manage.web.qo.hm.data.HmLinkClerkListQO;
 import com.gic.haoban.manage.web.utils.CreatorUtils;
 import com.gic.haoban.manage.web.utils.statistics.DataStatisticsParamUtils;
+import com.gic.haoban.manage.web.utils.statistics.DateUtils;
 import com.gic.haoban.manage.web.vo.hm.HmLinkListVO;
 import com.gic.haoban.manage.web.vo.hm.HmLinkVO;
 import com.gic.haoban.manage.web.vo.hm.WxUserAddLogVO;
@@ -112,8 +113,8 @@ public class HmLinkController {
         dto.setEnterpriseId(loginUser.getEnterpriseId());
         ServiceResponse<String> saveResp = this.hmLinkApiService.save(dto);
         if (saveResp.isSuccess()) {
-            if(dto.getLinkType()==HmLinkTypeEnum.CHAT_HM_LINK_TYPE.getLinkType()) {
-                GicLogRecordEvaluationContext.setOptPage("引流入群-新建链接") ;
+            if (dto.getLinkType() == HmLinkTypeEnum.CHAT_HM_LINK_TYPE.getLinkType()) {
+                GicLogRecordEvaluationContext.setOptPage("引流入群-新建链接");
             }
             String logContent = "新增引流链接【" + saveResp.getResult() + "-" + dto.getName() + "】";
             logger.info(logContent);
@@ -151,7 +152,7 @@ public class HmLinkController {
                     GicLogRecordEvaluationContext.noWriteLog();
                 }
                 logger.info(logContent);
-                GicLogRecordEvaluationContext.setOptPage("引流入群-编辑链接") ;
+                GicLogRecordEvaluationContext.setOptPage("引流入群-编辑链接");
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
                 return RestResponse.successResult();
@@ -181,6 +182,13 @@ public class HmLinkController {
             if (null == dto.getOtherChatHmId()) {
                 return RestResponse.failure("9999", "其他可入群不能为空");
             }
+            if (CollectionUtils.isNotEmpty(dto.getLinkChatList())) {
+                for (HmLinkChatDTO chat : dto.getLinkChatList()) {
+                    if (null == chat.getChatHmId()) {
+                        return RestResponse.failure("9999", "请选择活码");
+                    }
+                }
+            }
         } else {
             if (StringUtils.isEmpty(dto.getMemberLabelId())) {
                 return RestResponse.failure("9999", "链接标签不能为空");
@@ -637,7 +645,7 @@ public class HmLinkController {
         }
         if (qdto.getLinkType() != null) {
             jsonObject.put("linkType", qdto.getLinkType());
-        }else {
+        } else {
             jsonObject.put("linkType", "1,2");
         }
         if (qdto.getStartDate() != null) {