排序

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -161,13 +161,14 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     @Override
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType) {
-        return this.listForSms(wxEnterpriseId, enterprieId, linkName, linkType,null);
+        return this.listForSms(wxEnterpriseId, enterprieId, linkName, linkType, null);
     }
-    
+
     @Override
     public ServiceResponse<List<HmLinkDTO>> listForSms(String wxEnterpriseId, String enterprieId, String linkName,
             Integer linkType, List<String> creatorIdList) {
-        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType,creatorIdList);
+        List<HmLinkBO> list = this.hmLinkService.listForSms(wxEnterpriseId, enterprieId, linkName, linkType,
+                creatorIdList);
         List<HmLinkDTO> retList = EntityUtil.changeEntityListByJSON(HmLinkDTO.class, list);
         return ServiceResponse.success(retList);
     }
@@ -201,8 +202,10 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         }
         if (CollectionUtils.isNotEmpty(hmList)) {
             for (HmLinkChatDTO item : hmList) {
-                boolean flag = this.memberCondition(enterpriseId, memberId, item , link.getCreatorId() , link.getUpdateTime());
+                boolean flag = this.memberCondition(enterpriseId, memberId, item, link.getCreatorId(),
+                        link.getUpdateTime());
                 if (flag) {
+                    log.info("使用特殊群活码={}", item.getChatHmId());
                     hmId = item.getChatHmId();
                     break;
                 }
@@ -210,8 +213,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         }
         GroupChatHmBO hm = null;
         if (null == hmId) {
-            log.info("使用其它群活码");
-            hmId = link.getOtherChatHmId();
+            log.info("群活码不存在");
+            return ServiceResponse.failure("9999", "群活码不存在");
         }
         hm = this.groupChatHmService.getById(hmId);
         if (null == hm) {
@@ -256,7 +259,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
 
         // 如果是社群链接
         if (link.getLinkType() == HmLinkTypeEnum.CHAT_HM_LINK_TYPE.getLinkType()) {
-            log.info("群链接,linkId={}",link.getLinkId());
+            log.info("群链接,linkId={}", link.getLinkId());
             return this.getLinkChatHmFromWxa(wxEnterpriseId, enterpriseId, mixPhone, unionid, memberId, link, retDTO);
         }
 
@@ -641,7 +644,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return memberDataDTO;
     }
 
-    private boolean memberCondition(String enterpriseId, String memberId, HmLinkChatDTO dto , String creatorId , Date updateTime) {
+    private boolean memberCondition(String enterpriseId, String memberId, HmLinkChatDTO dto, String creatorId,
+            Date updateTime) {
         boolean flag = true;
         int memberType = dto.getMemberType();
         String limitCondition = dto.getFilterJson();

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

@@ -64,7 +64,7 @@
                 #{id,jdbcType=VARCHAR}
             </foreach>
      </if>
-  	 <if test="null != searchParams">
+  	 <if test="null != searchParams and ''!=searchParams ">
   	 	and b.staff_name like '%${searchParams}%'
   	 </if>
   	 <if test="status==1">

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

@@ -189,6 +189,7 @@
 			 	#{id}
 			 </foreach>
 		</if>
+		order by create_time desc
 	</select>
 	
 	<update id="updateData">