Merge branch 'ferture/四月迭代需求' into 'developer'

过滤非上线门店

See merge request !1189

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

@@ -521,12 +521,22 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         }
         List<StaffClerkRelationDTO> retList = new ArrayList<>() ;
         for(StaffClerkRelationDTO item : list) {
+            boolean delFlag = false ;
             String clerkId = item.getClerkId() ;
             ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
-            if(null != clerk && clerk.getStatus() == 1) {
-                retList.add(item) ;
-            }else {
+            if(null == clerk || clerk.getStatus() != 1) {
+                delFlag = true ;
+            }
+            if(!delFlag && null != clerk && clerk.getClerkType()<2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
+                StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
+                if(null == store || store.getStatus() != 2) {
+                    delFlag = true ;
+                }
+            }
+            if(delFlag) {
                 this.mapper.delByClerkId(clerkId);
+            }else {
+                retList.add(item) ;
             }
         }
         return retList ;
@@ -538,7 +548,17 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         }
         String clerkId = dto.getClerkId() ;
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+        boolean delFlag = false ;
         if(null == clerk || clerk.getStatus() != 1) {
+            delFlag = true ;
+        }
+        if(!delFlag &&  null != clerk && clerk.getClerkType() <2 && StringUtils.isNotEmpty(clerk.getStoreId())) {
+            StoreDTO store = this.storeService.getStore(clerk.getStoreId()) ;
+            if(null == store || store.getStatus() != 2) {
+                delFlag = true ;
+            }
+        }
+        if(delFlag) {
             this.mapper.delByClerkId(clerkId);
             dto = null ;
         }

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

@@ -1552,7 +1552,7 @@ public class WxStaffController extends WebBaseController {
         for (StaffClerkRelationDTO staffClerkRelationDTO : bindRelationList) {
             String storeId = staffClerkRelationDTO.getStoreId();
             StoreDTO store = storeService.getStore(storeId);
-            if (store == null) {
+            if (store == null || store.getStatus() != 2) {
                 continue;
             }
             String enterpriseId = store.getEnterpriseId();