Explorar o código

fixed 平台超管权限判断问题

fushengqian hai 5 meses
pai
achega
0ad446da98

+ 4 - 1
fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendMemberController.java

@@ -284,7 +284,10 @@ public class BackendMemberController extends BaseController {
             memberInfo = memberService.queryMemberById(Integer.parseInt(id));
         }
 
-        memberInfo.setMerchantId(accountInfo.getMerchantId());
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            memberInfo.setMerchantId(accountInfo.getMerchantId());
+        }
+
         memberInfo.setName(name);
         memberInfo.setStatus(status);
         if (StringUtil.isNotEmpty(groupId)) {

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

@@ -175,7 +175,9 @@ public class BackendStaffController extends BaseController {
         if (mtStaff == null && StringUtil.isNotEmpty(id)) {
             return getFailureResult(201, "员工信息不存在");
         }
-        mtStaff.setMerchantId(accountInfo.getMerchantId());
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            mtStaff.setMerchantId(accountInfo.getMerchantId());
+        }
         mtStaff.setStoreId(Integer.parseInt(storeId));
         mtStaff.setRealName(realName);
         if (PhoneFormatCheckUtils.isChinaPhoneLegal(mobile)) {