Merge remote-tracking branch 'origin/master'

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/user/UserController.java

@@ -1,8 +1,10 @@
 package com.unis.module.system.controller.admin.user;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.unis.framework.apilog.core.annotation.ApiAccessLog;
 import com.unis.framework.common.enums.CommonStatusEnum;
 import com.unis.framework.common.pojo.CommonResult;
@@ -97,6 +99,13 @@ public class UserController {
                 reqVO.setBankType(bankType);
             }
         }
+        String areaLevel = loginUser.getInfo().get("areaLevel");
+        // 国家交易中心创建银行角色
+        if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
+            if (roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())){
+                reqVO.setAreaLevel(0);
+            }
+        }
         Long id = userService.createUser(reqVO);
         return success(id);
     }