托管列表

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/qdto/OpenStaffPageQDTO.java

@@ -35,6 +35,16 @@ public class OpenStaffPageQDTO implements Serializable {
 
     private List<String> staffIds ;
 
+    private String loginClerkId ;
+
+    public String getLoginClerkId() {
+        return loginClerkId;
+    }
+
+    public void setLoginClerkId(String loginClerkId) {
+        this.loginClerkId = loginClerkId;
+    }
+
     public List<String> getStaffIds() {
         return staffIds;
     }

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

@@ -20,6 +20,7 @@ import com.gic.haoban.manage.api.dto.StoreClerkDTO;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.enums.OpenStaffOfflineEnum;
 import com.gic.haoban.manage.api.qdto.OpenStaffPageQDTO;
+import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.notify.NoticeMessageApiService;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.dao.mapper.OpenStaffMapper;
@@ -62,6 +63,8 @@ public class OpenStaffServiceImpl implements OpenStaffService {
     private StaffMapper staffMapper;
     @Autowired
     private EnterpriseUseForbidService enterpriseUseForbidService;
+    @Autowired
+    private StaffApiService staffApiService ;
 
     @Override
     public TabOpenStaff save(TabOpenStaff tab) {
@@ -124,9 +127,12 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         log.info("分页查询条件={}", JSONObject.toJSONString(qdto));
         String wxEnterpriseId = qdto.getWxEnterpriseId();
         String enterpriseId = qdto.getEnterpriseId();
-        List<String> storeIdList = null;
+        List<String> storeIdList = staffApiService.getHaoBanStoreIdsRolesByClerkId(qdto.getLoginClerkId(), enterpriseId);
         if (CollectionUtils.isNotEmpty(qdto.getStoreGroupIdList())) {
-            storeIdList = this.getStoreIdList(enterpriseId, qdto.getStoreGroupIdList());
+            storeIdList = this.getStoreIdList(enterpriseId, qdto.getStoreGroupIdList(),storeIdList);
+        }
+        if((storeIdList.size()==1 && storeIdList.contains("-1"))) {
+            storeIdList = null ;
         }
         if (StringUtils.isNotBlank(qdto.getClerkId()) || CollectionUtils.isNotEmpty(storeIdList)) {
             List<String> staffIds = staffClerkRelationService.listAllStaffIdForOpenStaff(enterpriseId, wxEnterpriseId, qdto.getClerkId(), storeIdList);
@@ -188,7 +194,7 @@ public class OpenStaffServiceImpl implements OpenStaffService {
     }
 
 
-    private List<String> getStoreIdList(String enterpriseId, List<String> storeGroupIds) {
+    private List<String> getStoreIdList(String enterpriseId, List<String> storeGroupIds , List<String> storeList) {
         StoreSearchDTO storeSearch = new StoreSearchDTO();
         List<String> groupIds = storeGroupService.getStoreGroupIdsByParentGroupId(enterpriseId, storeGroupIds);
         storeSearch.setStoreGroupIdList(groupIds);
@@ -197,6 +203,9 @@ public class OpenStaffServiceImpl implements OpenStaffService {
         Page pageStore = new Page<>();
         //-1代表不分页
         pageStore.setCurrentPage(-1);
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            storeSearch.setStoreIdList(storeList);
+        }
         Page resultPage = storeService.storeListPage(pageStore, storeSearch);
         List<StoreDTO> storeDTOList = resultPage.getResult();
         if (CollectionUtils.isEmpty(storeDTOList)) {

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

@@ -87,6 +87,7 @@ public class QywxOpenController {
         if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
+        qdto.setLoginClerkId(loginUser.getClerkId());
         ServiceResponse<Page<OpenStaffListDTO>> pageResp = this.openStaffApiService.page(qdto, basePageInfo);
         Page<OpenStaffListDTO> page = pageResp.getResult();
         Page<OpenStaffVO> retPage = PageHelperUtils.changePageToCurrentPage(page, OpenStaffVO.class);
@@ -117,6 +118,7 @@ public class QywxOpenController {
         if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
+        qdto.setLoginClerkId(loginUser.getClerkId());
         ServiceResponse<Page<OpenStaffListDTO>> pageResp = this.openStaffApiService.page(qdto, basePageInfo);
         final int totalCount = pageResp.getResult().getTotalCount();
         if (totalCount == 0) {