Merge branch 'feature/xgh/240820' into 'developer'

Feature/xgh/240820

See merge request !2122

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

@@ -1008,7 +1008,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             pageParam.setCurrentPage(1);
             pageParam.setPageSize(1);
             if(clerkType == 2) {
-                String storeWidgetId = this.powerService.getStoreWidgetId(new Date(), clerkId);
+                String storeWidgetId = this.powerService.getStoreWidgetId(null, clerkId);
                 if(null != storeWidgetId) {
                     Page<StoreDTO> page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, clerkDTO.getEnterpriseId(), pageParam, null,null);
                     storeId = page.getResult().get(0).getStoreId();
@@ -1046,7 +1046,7 @@ public class StaffApiServiceImpl implements StaffApiService {
         String enterpriseId = clerkDTO.getEnterpriseId();
         EnterpriseSettingDTO enterpriseSetting = enterpriseService.getEnterpriseSettingByEnterpriseId(enterpriseId);
         if (enterpriseSetting.getEnableAccessControl() != null && enterpriseSetting.getEnableAccessControl() == 1) {
-            String storeWidgetId = this.powerService.getStoreWidgetId(new Date(), clerkId);
+            String storeWidgetId = this.powerService.getStoreWidgetId(null, clerkId);
             if (StringUtils.isBlank(storeWidgetId)) {
                 logger.info("导购无门店权限,门店组件id is null");
                 return Collections.emptyList();

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

@@ -191,6 +191,9 @@ public class QywxOpenController {
                 return RestResponse.failure("9999","参数为空") ;
             }
             OpenStaffDTO openStaff = staffResp.getResult() ;
+            if(openStaff == openStaff) {
+                return RestResponse.failure("9999","该账号在当前企业下不存在") ;
+            }
             if(null != openStaff && openStaff.getStatusFlag()==1) {
                 StaffDTO staff = this.staffApiService.selectById(staffId);
                 openStaff.setStaffHeadImg(staff.getHeadImg());

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

@@ -1738,7 +1738,7 @@ public class WxStaffController extends WebBaseController {
         int totalCount = 0;
         List<StoreDTO> storeDTOList = new ArrayList<>();
         if (storeIdList.get(0).contains("-1")) {
-            String storeWidgetId = this.powerService.getStoreWidgetId(new Date(), clerkId);
+            String storeWidgetId = this.powerService.getStoreWidgetId(null, clerkId);
             logger.info("权限-所有门店storeWidgetId={}", storeWidgetId);
             Page<Object> pageParam = new Page<Object>();
             pageParam.setCurrentPage(currentPage);