Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -427,7 +427,7 @@ public class DwxxServiceImpl implements DwxxService {
                         bankDO.setDeleted(false);
                         bankDO.setRdyhId(bankType);
                         bankDO.setHyState(0);
-                        bankDO.setHyryName(dictBank.getLabel());
+                        bankDO.setRdyhName(dictBank.getLabel());
                         bankDOS.add(bankDO);
                     }
                     if (!ObjectUtils.isEmpty(bankDOS)) {

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

@@ -102,7 +102,7 @@ public class UserController {
         String areaLevel = loginUser.getInfo().get("areaLevel");
         // 国家交易中心创建银行角色
         if ("0".equals(areaLevel) || ObjectUtil.isEmpty(areaLevel)) {
-            if (roleIds.contains(RoleIdEnum.BANK_ADMIN.getRoleId())){
+            if (roleIds.contains(Long.valueOf(RoleIdEnum.BANK_ADMIN.getRoleId()))){
                 reqVO.setAreaLevel(0);
             }
         }