会员代开发查门店不处理主门店

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

@@ -159,14 +159,16 @@ public class StoreController extends WebBaseController {
         }
         List<String> storeIdList = list.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
         // 处理主门店
-        ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId, storeIdList);
-        String mainStoreId = mainDTO == null ? "" : mainDTO.getStoreId();
-        if (null != mainStoreId) {
-            list.forEach(item -> {
-                if (item.getStoreId().equals(mainStoreId)) {
-                    item.setMainStoreFlag(1);
-                }
-            });
+        if(StringUtils.isBlank(gicEnterpriseId)) {
+            ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId, storeIdList);
+            String mainStoreId = mainDTO == null ? "" : mainDTO.getStoreId();
+            if (null != mainStoreId) {
+                list.forEach(item -> {
+                    if (item.getStoreId().equals(mainStoreId)) {
+                        item.setMainStoreFlag(1);
+                    }
+                });
+            }
         }
         return resultResponse(HaoBanErrCode.ERR_1, list);
     }

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

@@ -1591,14 +1591,16 @@ public class WxStaffController extends WebBaseController {
         }
         List<String> storeIdList = list.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
         // 处理主门店
-        ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId, storeIdList);
-        String mainStoreId = mainDTO == null ? "" : mainDTO.getStoreId();
-        if (null != mainStoreId) {
-            list.forEach(item -> {
-                if (item.getStoreId().equals(mainStoreId)) {
-                    item.setMainStoreFlag(1);
-                }
-            });
+        if(StringUtils.isBlank(gicEnterpriseId)) {
+            ClerkMainStoreRelatedDTO mainDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId, storeIdList);
+            String mainStoreId = mainDTO == null ? "" : mainDTO.getStoreId();
+            if (null != mainStoreId) {
+                list.forEach(item -> {
+                    if (item.getStoreId().equals(mainStoreId)) {
+                        item.setMainStoreFlag(1);
+                    }
+                });
+            }
         }
         return RestResponse.successResult(list);
     }