过滤回收站的门店

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

@@ -509,7 +509,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             }
             if(!delFlag && null != clerk && clerk.getClerkType()<2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
                 StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
-                if(null == store || store.getStatus() != 2) {
+                if(null == store || store.getStatus() == -3) {
                     delFlag = true ;
                 }
             }
@@ -534,7 +534,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         }
         if(!delFlag &&  null != clerk && clerk.getClerkType() <2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
             StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
-            if(null == store || store.getStatus() != 2) {
+            if(null == store || store.getStatus() == -3) {
                 delFlag = true ;
             }
         }

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

@@ -374,11 +374,13 @@ public class StaffController extends WebBaseController {
                         }
                     }
                     StoreDTO store = storeService.getStore(clerkInfoVo.getStoreId());
-                    if (null != store) {
+                    if (null != store && store.getStatus() != -3) {
                         clerkInfoVo.setStoreName(store.getStoreName());
-
                     }
                 });
+                if (manageFlag == null || manageFlag != 1) {
+                    retList = retList.stream().filter(o->StringUtils.isNotEmpty(o.getStoreName())).collect(Collectors.toList()) ;
+                }
             }
         }
         return resultResponse(HaoBanErrCode.ERR_1, retList);