Merge branch 'feature-canvas' into 'developer'

Feature canvas

See merge request !2423

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

@@ -816,6 +816,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             String wxEnterpriseId = dto.getWxEnterpriseId();
             String msgid = dto.getMsgid();
             WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+            if(null == qwDTO) {
+                return;
+            }
             String secret = config.getWxSuiteid();
             if (qwDTO.isSelf()) {
                 secret = qwDTO.getSelfSecret();

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

@@ -916,6 +916,10 @@ public class StaffApiServiceImpl implements StaffApiService {
                                                                              boolean isMustReturnStoreIdWhenSuperAdmin, Boolean addUnassignedStore) {
         //兼容店长和店员登陆
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        if (clerkDTO == null) {
+            logger.info("被删除或者冻结:{}", clerkId);
+            return Collections.singletonList("no_store");
+        }
         if (clerkDTO != null) {
             if (clerkDTO.getClerkType() == null || clerkDTO.getClerkType() == 0 || clerkDTO.getClerkType() == 1) {
                 StoreDTO storeDTO = storeService.getStore(clerkDTO.getStoreId());

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

@@ -297,7 +297,7 @@
 			a.send_time  sendTime,
 			a.msgid msgid
 		FROM tab_haoban_group_chat_plan_owner_log a LEFT JOIN tab_haoban_group_chat_plan b ON a.plan_id = b.plan_id
-		WHERE b.exec_type = 0 AND a.send_status = 1 AND a.msgid IS not NULL and b.end_time <![CDATA[<=]]> now()
+		WHERE b.exec_type = 0 AND a.send_status = 1 AND a.msgid IS not NULL and b.end_time <![CDATA[<=]]> now()   AND end_time > DATE_ADD(CURDATE(), INTERVAL -2 DAY)
 	</select>