From 55f5271f893a25a7be671b24938e49976936a67b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 九月 2025 18:30:00 +0800
Subject: [PATCH] 新增Orgid
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 323dd8c..ca34c52 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -272,7 +272,11 @@
@Override
public SysUser selectUserByUserNameAndDeptId(String userName) {
String[] split = userName.split("&");
+ if (split[2].contains("null")) {
+ split[2] = null;
+ }
SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);
+ log.info("selectUserByUserNameAndDeptId鐨剆ysUser鐨勫�间负锛歿}", sysUser);
if (Objects.isNull(sysUser)) return sysUser;
List<SysDept> sysDepts = null;
if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
@@ -512,15 +516,66 @@
// 鏂板鐢ㄦ埛淇℃伅
int rows = userMapper.insertUser(user);
//鏂板鐢ㄦ埛涓庨儴闂ㄥ叧鑱�
- if (!CollectionUtils.isEmpty(user.getDepts())) {
- for (Long deptId : user.getDepts()) {
- SysUserDept sysUserDep = new SysUserDept();
- sysUserDep.setUserId(user.getUserId());
- sysUserDep.setDeptId(deptId);
- sysUserDep.setCreateTime(new Date());
- sysUserDep.setUpdateTime(new Date());
- sysUserDep.setOrgid(user.getOrgid());
- sysUserDeptMapper.insertSysUserDept(sysUserDep);
+// if (!CollectionUtils.isEmpty(user.getDepts())) {
+// for (Long deptId : user.getDepts()) {
+// SysUserDept sysUserDep = new SysUserDept();
+// sysUserDep.setUserId(user.getUserId());
+// sysUserDep.setDeptId(deptId);
+// sysUserDep.setCreateTime(new Date());
+// sysUserDep.setUpdateTime(new Date());
+// sysUserDep.setOrgid(user.getOrgid());
+// sysUserDeptMapper.insertSysUserDept(sysUserDep);
+// }
+// }
+ if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
+ for (String deptCode : user.getDeptCodes()) {
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
+ if (ObjectUtils.isEmpty(sysDept)) {
+ continue;
+ }
+
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(user.getUserId());
+ sysUserDept.setOrgid(user.getOrgid());
+ sysUserDept.setDeptCode(deptCode);
+ sysUserDept.setDeptId(sysDept.getDeptId());
+ List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ sysUserDept.setDelFlag(0L);
+ sysUserDept.setDeptType("1");
+ sysUserDept.setDeptName(sysDept.getDeptName());
+ sysUserDept.setUpdateTime(new Date());
+ if (!CollectionUtils.isEmpty(sysUserDepts)) {
+ sysUserDept.setId(sysUserDepts.get(0).getId());
+ sysUserDeptMapper.updateSysUserDept(sysUserDept);
+ continue;
+ }
+ sysUserDept.setCreateTime(new Date());
+ sysUserDeptMapper.insertSysUserDept(sysUserDept);
+ }
+ }
+ if (!CollectionUtils.isEmpty(user.getWardCodes())) {
+ for (String wardCode : user.getWardCodes()) {
+ SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);
+ if (ObjectUtils.isEmpty(sysDept)) {
+ continue;
+ }
+ SysUserDept sysUserDept = new SysUserDept();
+ sysUserDept.setUserId(user.getUserId());
+ sysUserDept.setDeptCode(wardCode);
+ sysUserDept.setDeptId(sysDept.getDeptId());
+ sysUserDept.setOrgid(user.getOrgid());
+ List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
+ sysUserDept.setDelFlag(0L);
+ sysUserDept.setDeptType("2");
+ sysUserDept.setOrgid(user.getOrgid());
+ sysUserDept.setDeptName(sysDept.getDeptName());
+ sysUserDept.setUpdateTime(new Date());
+ if (!CollectionUtils.isEmpty(sysUserDepts)) {
+ sysUserDeptMapper.updateSysUserDept(sysUserDept);
+ continue;
+ }
+ sysUserDept.setCreateTime(new Date());
+ sysUserDeptMapper.insertSysUserDept(sysUserDept);
}
}
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
--
Gitblit v1.9.3