群活码查询

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatSearchQDTO.java

@@ -25,7 +25,17 @@ public class GroupChatSearchQDTO implements Serializable {
     private List<Long> groupChatIdList ;
     private String sortColumn ;
     private String sortType = "desc" ;
+    // 群列表页需要显示未关联gic商户的
+    private boolean chatPageFlag = false ;
     
+    public boolean isChatPageFlag() {
+        return chatPageFlag;
+    }
+
+    public void setChatPageFlag(boolean chatPageFlag) {
+        this.chatPageFlag = chatPageFlag;
+    }
+
     public List<Long> getGroupChatIdList() {
         return groupChatIdList;
     }

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

@@ -213,10 +213,11 @@ public class GroupChatServiceImpl implements GroupChatService {
         PageHelper.startPage(basePageInfo);
         if (null != qdto.getChatHmId()) {
             List<TabGroupChatHmRelation> list = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
-            List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(groupChatIdList)) {
+            if (CollectionUtils.isEmpty(list)) {
                 return new Page<GroupChatBO>();
             }
+            logger.info("活码页查询群列表{},关联群数={}", qdto.getChatHmId(), list.size());
+            List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
             qdto.setGroupChatIdList(groupChatIdList);
         }
         List<TabGroupChat> list = this.groupChatMapper.list(qdto);

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatMapper.xml

@@ -209,7 +209,12 @@
 	
 	<select id="list" resultMap="result-map-tabHaobanGroupChat" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO">
 		select <include refid="Base_Column_List" /> from tab_haoban_group_chat where wx_enterprise_id=#{wxEnterpriseId}
-		 and (enterprise_id = #{enterpriseId} or enterprise_id is null)
+		<if test="chatPageFlag==true">
+			and (enterprise_id = #{enterpriseId} or enterprise_id is null)
+		</if>
+		 <if test="chatPageFlag==false">
+			and enterprise_id = #{enterpriseId} 
+		</if>
 		<if test="null != staffId">
 			and staff_id = #{staffId}
 		</if>
@@ -247,6 +252,7 @@
 			and gic_flag = 1
 		</if>
 		<if test="null != groupChatIdList and groupChatIdList.size>0">
+			and group_chat_id in 
 			<foreach collection="groupChatIdList" close=")" open="(" index="index" item="groupChatId" separator=",">
 				#{groupChatId}
 			</foreach>

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

@@ -67,6 +67,7 @@ public class GroupChatController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        qdto.setChatPageFlag(true);
         ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -52,6 +52,8 @@ public class GroupChatHmController {
     @RequestMapping("update")
     public RestResponse<Object> update(@RequestBody GroupChatHmDTO dto) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        dto.setEnterpriseId(loginUser.getEnterpriseId());
         dto.setModifierId(loginUser.getClerkId());
         dto.setModifierName(loginUser.getClerkName());
         this.groupChatHmApiService.save(dto);
@@ -69,6 +71,9 @@ public class GroupChatHmController {
 
     @RequestMapping("detail")
     public RestResponse<Object> detail(Long chatHmId) {
+        if(null == chatHmId) {
+            return RestResponse.failure("1", "群活码ID空");
+        }
         ServiceResponse<GroupChatHmDTO> linkResp = this.groupChatHmApiService.detail(chatHmId);
         if (!linkResp.isSuccess()) {
             return RestResponse.failure("1", "群活码不存在");