Merge branch 'feature-haoban-role' into developer

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

@@ -869,8 +869,19 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     @Override
     public StoreRoleDTO getCountHaoBanStoreIdsByClerkId(String clerkId, String wxEnterpriseId) {
-        List<String> storeIds = getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
         StoreRoleDTO storeRoleDTO = new StoreRoleDTO();
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkId);
+        if (clerkDTO == null) {
+            storeRoleDTO.setStoreCount(0);
+            return storeRoleDTO;
+        }
+        Integer clerkType = clerkDTO.getClerkType();
+        if (clerkType != null && clerkType != 2) {
+            storeRoleDTO.setStoreCount(1);
+            storeRoleDTO.setStoreId(clerkDTO.getStoreId());
+            return storeRoleDTO;
+        }
+        List<String> storeIds = getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
         if (CollectionUtils.isEmpty(storeIds)) {
             storeRoleDTO.setStoreCount(0);
             return storeRoleDTO;