From 1c82e21ac936241bf56109e7fff87446b0b6a131 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 19 十月 2026 15:31:22 +0800
Subject: [PATCH] 【丽水】新增接口 修复Sys_User_Dept数据缺失问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index dd306d6..c681538 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -20,12 +20,13 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
-import com.smartor.mapper.SysUserDeptMapper;
+import com.ruoyi.system.mapper.SysUserDeptMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -60,7 +61,11 @@
private ISysPostService postService;
@Autowired
+ @Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
+
+ @Autowired
+ private ISysDeptService sysDeptService;
@Value("${isAdmin}")
private List<Long> isAdmin;
@@ -125,7 +130,16 @@
log.info("--------userId鐨勫�间负锛歿}", userId);
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
- List<SysRole> roles = roleService.selectRoleAll();
+
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ log.info("--------user鐨勫�间负锛歿}", user);
+
+ SysRole roleVo = new SysRole();
+ roleVo.setOrgid(user.getOrgid());
+ List<SysRole> roles = roleService.selectRoleList(roleVo);
+ log.info("--------roles鐨勫�间负锛歿}", roles);
+
ajax.put("roles", isAdmin.contains(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
if (StringUtils.isNotNull(userId)) {
@@ -136,19 +150,19 @@
}
List<SysUserDept> sysUserDeptKSs = null;
List<SysUserDept> sysUserDeptBQs = null;
+ List<SysDept> sysDeptKSs = null;
+ List<SysDept> sysDeptBQs = null;
SysUserDept sysUserDept = new SysUserDept();
sysUserDept.setUserId(userId);
sysUserDept.setDeptType("1");
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- log.info("--------user鐨勫�间负锛歿}", user);
+
sysUserDept.setOrgid(user.getOrgid());
- sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- ajax.put("belongDepts", sysUserDeptKSs);
+ sysDeptKSs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
+ ajax.put("belongDepts", sysDeptKSs);
sysUserDept.setDeptType("2");
- sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- ajax.put("belongWards", sysUserDeptBQs);
+ sysDeptBQs = sysDeptService.selectLeafSysDeptListBySysUserDept(sysUserDept);
+ ajax.put("belongWards", sysDeptBQs);
return ajax;
}
@@ -269,6 +283,18 @@
}
/**
+ * 鏍规嵁 sys_user.hosp_info锛堢瀹わ級鍜� sys_user.dept_info锛堢梾鍖猴級琛ュ叏 sys_user_dept 鏁版嵁
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @AddOrgId
+ @PostMapping("/repairUserDept")
+ public AjaxResult repairUserDept(@RequestBody(required = false) SysUser user) {
+ String orgid = user == null ? null : user.getOrgid();
+ Long userId = user == null ? null : user.getUserId();
+ return success(userService.repairUserDeptByHospAndDeptInfo(orgid, userId));
+ }
+
+ /**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:user:list')")
--
Gitblit v1.9.3