超管

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

@@ -961,26 +961,27 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         if (storeIds.contains("-1")) {
             logger.info("该导购为所有门店,clerkId={}",clerkId);
-            String storeWidgetId = this.powerService.getStoreWidgetId(new Date(), clerkId);
             int storeCount = 0 ;
             String storeId = null ;
-            if(null != storeWidgetId) {
-                Page<Object> pageParam = new Page<Object>();
-                pageParam.setCurrentPage(1);
-                pageParam.setPageSize(1);
-                Page<StoreDTO> page = new Page<>() ;
-                if(clerkType == 2) {
-                    page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, clerkDTO.getEnterpriseId(), pageParam, null,null);
-                }else if(clerkType == 3) {
-                    StoreSearchDTO searchDTO = new StoreSearchDTO() ;
-                    searchDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
-                    page = this.storeService.storeListPage(pageParam,searchDTO) ;
+            Page<Object> pageParam = new Page<Object>();
+            pageParam.setCurrentPage(1);
+            pageParam.setPageSize(1);
+            if(clerkType == 2) {
+                String storeWidgetId = this.powerService.getStoreWidgetId(new Date(), clerkId);
+                if(null != storeWidgetId) {
+                    Page<StoreDTO> page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, clerkDTO.getEnterpriseId(), pageParam, null,null);
+                    storeId = page.getResult().get(0).getStoreId();
+                    storeCount = page.getTotalCount();
                 }
+            }else if(clerkType == 3) {
+                StoreSearchDTO searchDTO = new StoreSearchDTO() ;
+                searchDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
+                Page<StoreDTO> page = this.storeService.storeListPage(pageParam,searchDTO) ;
                 storeId = page.getResult().get(0).getStoreId();
                 storeCount = page.getTotalCount();
-                storeRoleDTO.setStoreId(storeId);
-                storeRoleDTO.setStoreCount(storeCount);
             }
+            storeRoleDTO.setStoreId(storeId);
+            storeRoleDTO.setStoreCount(storeCount);
             return storeRoleDTO;
         }
         int size = storeIds.size();