From 2804df2af3c12758a3e78d056a78e9bbb93153e5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-BLB5287\\FP" <18691763612@163.com>
Date: Thu, 3 Jul 2025 15:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E5=8A=A9=E6=89=8B?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E7=BB=99=E5=8A=A0=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ConHelperServiceImpl.java     |  1 +
 .../impl/HealthUserOperatorExServiceImpl.java  |  2 ++
 .../service/impl/SysUserServiceImpl.java       | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java
index 5cb99d5..0200855 100644
--- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java
+++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java
@@ -102,6 +102,7 @@ public class ConHelperServiceImpl extends ServiceImpl<ConHelperMapper, ConHelper
 //        sysUserModel.setSecondDepartment(secondDepartOrgCode.getId());
 //        sysUserModel.setThirdDepartment(thirdDepartOrgCode.getId());
         sysUserModel.setRealname(conHelperExAndUser.getConHelper().getHelperName());
+        sysUserModel.setUserRoleCode("helper");
         String userId = sysBaseAPI.addUserToEx(sysUserModel);
 
         if (!StringUtils.hasLength(userId)) {
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserOperatorExServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserOperatorExServiceImpl.java
index 75c6d22..de7e202 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserOperatorExServiceImpl.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/HealthUserOperatorExServiceImpl.java
@@ -44,6 +44,7 @@ public class HealthUserOperatorExServiceImpl extends ServiceImpl<HealthUserOpera
     public Result<String> saveSpeciality(HealthUserOperatorExAndUser data) {
 
         data.getSysUserModel().setPersonType("6");
+        data.getSysUserModel().setUserRoleCode("emg_pro");
         String userId = sysUserServiceImpl.saveUser(data.getSysUserModel());
 
         if (StringUtils.isEmpty(userId)) {
@@ -81,6 +82,7 @@ public class HealthUserOperatorExServiceImpl extends ServiceImpl<HealthUserOpera
             return Result.error("不允许添加管理员");
         }
         data.getSysUserModel().setPersonType("5");
+        data.getSysUserModel().setUserRoleCode("emg_opt");
         String userId = sysUserServiceImpl.saveUser(data.getSysUserModel());
         if (StringUtils.isEmpty(userId)) {
             return Result.error("添加失败");
diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index f50cdbd..a428af9 100644
--- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -1554,7 +1554,23 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }
             userMapper.updateUserOrgCode(user.getId(), orgCode);
         }
-
+        //处理用户角色
+        if(StrUtil.isNotEmpty(sysUserModel.getUserRoleCode())){
+            LambdaQueryWrapper<SysRole> roleWrapper = new LambdaQueryWrapper<>();
+            roleWrapper.eq(SysRole::getRoleCode,sysUserModel.getUserRoleCode());
+            SysRole sysRole = sysRoleMapper.selectOne(roleWrapper,false);
+            if(null != sysRole){
+                LambdaQueryWrapper<SysUserRole> sysUserRoleWrapper = new LambdaQueryWrapper<>();
+                sysUserRoleWrapper.eq(SysUserRole::getUserId,user.getId());
+                sysUserRoleWrapper.eq(SysUserRole::getRoleId,sysRole.getId());
+                if(!sysUserRoleMapper.exists(sysUserRoleWrapper)){
+                    SysUserRole sysUserRole = new SysUserRole();
+                    sysUserRole.setRoleId(sysRole.getId());
+                    sysUserRole.setUserId(user.getId());
+                    sysUserRoleMapper.insert(sysUserRole);
+                }
+            }
+        }
         return user.getId();
     }