Merge branch 'feature/202310月零散迭代' into 'developer'

超管

See merge request !1532

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

@@ -189,6 +189,7 @@ public class GroupChatDataServiceImpl implements GroupChatDataService {
         int start = Integer.valueOf(key.split("_")[0]) ;
         int len = Integer.valueOf(key.split("_")[1]) ;
         Date startDate = DateUtil.addDay(DateUtil.getStartTimeOfDay(), -start);
+        logger.info("groupChatQuitTimer={}",key);
         for(int i=0;i<len;i++) {
             Date date = DateUtil.addDay(startDate, -(i+1));
             Date end = DateUtil.getEndTimeOfDay(date) ;
@@ -203,5 +204,6 @@ public class GroupChatDataServiceImpl implements GroupChatDataService {
                 }
             }
         }
+        logger.info("groupChatQuitTimer-end={}",key);
     }
 }
\ No newline at end of file

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

@@ -949,7 +949,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             return storeRoleDTO;
         }
         Integer clerkType = clerkDTO.getClerkType();
-        if (clerkType != null && clerkType != 2) {
+        if (clerkType != null && clerkType != 2 && clerkType != 3) {
             storeRoleDTO.setStoreCount(1);
             storeRoleDTO.setStoreId(clerkDTO.getStoreId());
             return storeRoleDTO;