fixed 管理员管理问题

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStaffController.java

@@ -243,6 +243,12 @@ public class BackendStaffController extends BaseController {
         }
 
         Map<String, Object> params = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("MERCHANT_ID", accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            storeId = accountInfo.getStoreId();
+        }
         params.put("AUDITED_STATUS", StatusEnum.ENABLED.getKey());
         params.put("STORE_ID", storeId);
         List<MtStaff> staffList = staffService.queryStaffByParams(params);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendStoreController.java

@@ -125,6 +125,7 @@ public class BackendStoreController extends BaseController {
     @CrossOrigin
     public ResponseObject search(HttpServletRequest request) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
+        String merchantId = request.getParameter("merchantId") == null ? "" : request.getParameter("merchantId");
         String storeId = request.getParameter("id") == null ? "" : request.getParameter("id");
         String storeName = request.getParameter("name") == null ? "" : request.getParameter("name");
 
@@ -138,6 +139,12 @@ public class BackendStoreController extends BaseController {
         }
 
         Map<String, Object> paramsStore = new HashMap<>();
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            merchantId = accountInfo.getMerchantId().toString();
+        }
+        if (StringUtil.isNotEmpty(merchantId)) {
+            paramsStore.put("merchantId", merchantId);
+        }
         if (StringUtil.isNotEmpty(storeId)) {
             paramsStore.put("storeId", storeId);
         }