feat：查询权限修改

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

@@ -7,6 +7,7 @@ import com.gic.cloud.data.api.service.MaidianDataService;
 import com.gic.cloud.web.service.api.dto.CloudStoreGroupDTO;
 import com.gic.cloud.web.service.api.service.CloudStoreGroupService;
 import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.ExcelUtils;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.service.StaffApiService;
@@ -66,7 +67,7 @@ public class MaidianDataController extends WebBaseController {
     //首页-企业概况
     @RequestMapping("/total-activation-data")
     public HaobanResponse totalActivationData(MemberAnalyzeParamsDTO paramsDTO) {
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(), AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
@@ -102,7 +103,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/total-login-data")
     public HaobanResponse totalLoginData(MemberAnalyzeParamsDTO paramsDTO, int datesType) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
@@ -135,7 +136,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/area-login-ranking")
     public HaobanResponse areaLoginRanking(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<AreaLoginDTO> list = maidianDataService.areaLoginRanking(paramsDTO);
@@ -150,7 +151,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/activite-date")
     public HaobanResponse activiteDate(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
@@ -168,7 +169,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/activite-list")
     public HaobanResponse activiteList(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         Page<HaobanClerkLoginDTO> page = maidianDataService.pageActiviteList(paramsDTO);
         return resultResponse(HaoBanErrCode.ERR_1, page);
@@ -179,7 +180,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/export-activite-list")
     public HaobanResponse exportActiviteList(HttpServletRequest request, HttpServletResponse response, MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         paramsDTO.setCurrentPage(1);
         paramsDTO.setPageSize(Integer.MAX_VALUE);
@@ -198,7 +199,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/export-login-detail-list")
     public HaobanResponse exportLoginDetailList(HttpServletRequest request, HttpServletResponse response, MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {
@@ -236,7 +237,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/login-detail-list")
     public HaobanResponse loginDetailList(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {
@@ -255,7 +256,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("area-ranking-date")
     public HaobanResponse areaRankingDate(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<AreaLoginDTO> list = maidianDataService.areaRankingDate(paramsDTO);
@@ -267,7 +268,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/area-ranking-list")
     public HaobanResponse areaRankingList(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {
@@ -287,7 +288,7 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/export-area-ranking-list")
     public HaobanResponse exportAreaRankingList(HttpServletRequest request, HttpServletResponse response, MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         paramsDTO.setStoreIdList(storeRolesByClerkId);
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {

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

@@ -29,7 +29,7 @@ public class StoreController extends WebBaseController{
 	//门店列表
 	@RequestMapping("/find-simple-page")
 	public HaobanResponse storeList(Integer storeType,String enterpriseId,BasePageInfo basePageInfo) {
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId());
+        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
         PageResult<StoreDTO> pageVo = new PageResult<>();
         if (CollectionUtils.isEmpty(storeRolesByClerkId)) {
             return resultResponse(HaoBanErrCode.ERR_1,pageVo);