超管

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

@@ -379,7 +379,7 @@ public class StaffController extends WebBaseController {
                 }
             }
         }
-        if(null != login.getSuperAdmin() && login.getSuperAdmin()==1) {
+        if(null != login.getSuperAdmin() && login.getSuperAdmin()==1 && manageFlag == 1) {
             ClerkDTO superClerk =   this.clerkService.getSuperAdminByEnterpriseId(enterpriseId) ;
             if(superClerk.getPhoneNumber().contains(search)) {
                 superClerk.setClerkName("超级管理员");

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

@@ -1708,11 +1708,22 @@ public class WxStaffController extends WebBaseController {
             Page<Object> pageParam = new Page<Object>();
             pageParam.setCurrentPage(currentPage);
             pageParam.setPageSize(pageSize);
-            Page<StoreDTO> page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, enterpriseId, pageParam,
-                    null, null);
-            if (page != null) {
-                storeDTOList = page.getResult();
-                totalCount = page.getTotalCount();
+            ClerkDTO clerkDTO = clerkService.getClerkByClerkIdNoStatus(clerkId);
+            if(clerkDTO.getClerkType() == 2) {
+                Page<StoreDTO> page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, enterpriseId, pageParam,
+                        null, null);
+                if (page != null) {
+                    storeDTOList = page.getResult();
+                    totalCount = page.getTotalCount();
+                }
+            }else if(clerkDTO.getClerkType()==3) {
+                StoreSearchDTO searchDTO = new StoreSearchDTO() ;
+                searchDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
+                Page<StoreDTO> page = this.storeService.storeListPage(pageParam,searchDTO) ;
+                if (page != null) {
+                    storeDTOList = page.getResult();
+                    totalCount = page.getTotalCount();
+                }
             }
         } else {
             totalCount = storeIdList.size();