Merge branch 'feature-2024-11-05-add-store-status-filter' into 'developer'

获取导购管辖门店数量兼容区经和店长店员

See merge request !2300

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxStaffController.java

@@ -1574,6 +1574,16 @@ public class WxStaffController extends WebBaseController {
 //        storeRoleVO.setStoreCount(storeRoleDTO.getStoreCount());
 //        storeRoleVO.setStoreDTO(storeService.getStore(storeRoleDTO.getStoreId()));
         StoreRoleVO storeRoleVO = new StoreRoleVO();
+        //兼容店长和店员登陆
+        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
+        if (clerkDTO != null) {
+            if (clerkDTO.getClerkType() == null || clerkDTO.getClerkType() == 0 || clerkDTO.getClerkType() == 1) {
+                StoreDTO storeDTO = storeService.getStore(clerkDTO.getStoreId());
+                storeRoleVO.setStoreCount(storeDTO == null ? 0 : 1);
+                storeRoleVO.setStoreDTO(storeDTO);
+                return RestResponse.successResult(storeRoleVO);
+            }
+        }
         List<String> list = staffApiService.getNotEmptyHaobanStoreIdsRolesByClerkIdAndStoreStatus(clerkId, wxEnterpriseId,
                 StoreStatusFilterUtils.getStoreStatusList(storeStatusFilter), null);
         storeRoleVO.setStoreCount(list.contains("no_store") ? 0 : list.size());