From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index 8bc93c6..9926a42 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -57,9 +57,9 @@
long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId();
if(companyId > UserEntity.USER_BELONG_TOP){
userEntity.setCompanyId(companyId);
- userEntity.setRoleName(RoleEntity.ROLE_ADMIN_NAME);
+ userEntity.setRoleId(RoleEntity.ROLE_ADMIN_NAME_ID);
}else if(companyId == UserEntity.USER_BELONG_TOP){
- userEntity.setRoleName(RoleEntity.ROLE_SUPER_NAME);
+ userEntity.setRoleId(RoleEntity.ROLE_SUPER_NAME_ID);
}
if(StrUtil.isNotEmpty(adminUserDto.getUsername())){
userEntity.setUsername(adminUserDto.getUsername());
--
Gitblit v1.9.1