子账号限制

src/main/java/org/springblade/modules/api/controller/ApiMerchantUserController.java

@@ -142,7 +142,7 @@ public class ApiMerchantUserController extends BaseController {
         if (CollectionUtil.isNotEmpty(query1)) {
             return R.fail("手机号已注册，请更换其他手机号！");
         }
-        if (!isMerchant()){
+        if (!isMerchant()) {
             return R.fail("没有添加子账号权限！");
         }
         String tenantId = WebUtil.getRequest().getHeader(TokenUtil.TENANT_HEADER_KEY);
@@ -183,7 +183,7 @@ public class ApiMerchantUserController extends BaseController {
         if (Objects.isNull(userMerchant)) {
             return R.fail("子账号不存在");
         }
-        if (!isMerchant()){
+        if (!isMerchant()) {
             return R.fail("没有编辑子账号权限！");
         }
         //获取子账号用户信息
@@ -338,7 +338,9 @@ public class ApiMerchantUserController extends BaseController {
             result.put("故障设备", "0");
             result.put("在线设备", "0");
         }
-        result.put("子账号", iUserMerchantService.getChildNum(userId));
+        if (isMerchant()) {
+            result.put("子账号", iUserMerchantService.getChildNum(userId));
+        }
         result.put("订单量", orderGoodsService.getMerchantOrderNum(userId));
         return R.data(result);
     }