From 40fc47ece733ddc3113c2413ae27aadbf102a9e2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 23 四月 2026 14:49:49 +0800
Subject: [PATCH] 提交
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 273 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 183 insertions(+), 90 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..d242f63 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
@@ -14,11 +14,12 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
-import com.smartor.domain.SvyTaskVO;
-import com.smartor.mapper.SysUserDeptMapper;
+import com.ruoyi.common.core.service.IUserExtInfoService;
+import com.ruoyi.system.mapper.SysUserDeptMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -30,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * 鐢ㄦ埛 涓氬姟灞傚鐞�
+ * 鐢ㄦ埛 涓氬姟灞傚锟�?
*
* @author ruoyi
*/
@@ -45,7 +46,9 @@
private SysDeptMapper sysDeptMapper;
@Autowired
+ @Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
+
@Autowired
private SysRoleMapper roleMapper;
@@ -78,10 +81,16 @@
@DataScope(deptAlias = "d", userAlias = "u")
public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
+
+ }
+
+ @Override
+ public List<SysUser> getUserList(SysUser user) {
+ return userMapper.getUserList(user);
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪锟�?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
@@ -93,7 +102,7 @@
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪锟�?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
@@ -105,9 +114,9 @@
}
/**
- * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
+ * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤锟�?
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
@@ -168,6 +177,18 @@
public SysUser selectUserByUserName2(String userName) {
String[] split = userName.split("&");
SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
+
+ //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌锟�?
+ IUserExtInfoService userExtInfoService = SpringUtils.getBean(IUserExtInfoService.class);
+ Map<String, String> userOrgInfo = userExtInfoService.getUserOrgInfo(
+ sysUser.getUserId().toString(),
+ split[1],
+ split[2]);
+ if (!userOrgInfo.isEmpty()) {
+ sysUser.setOrgid(userOrgInfo.get("orgid"));
+ sysUser.setCampusid(userOrgInfo.get("campusid"));
+ }
+
if (Objects.isNull(sysUser)) return sysUser;
List<SysDept> sysDepts = null;
if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
@@ -264,7 +285,12 @@
if (StringUtils.isNotEmpty(sud.getDeptName())) map.put("deptName", sud.getDeptName());
list.add(map);
}
+ //鑾峰彇褰撳墠鏈烘瀯鐨勬弧鎰忓害闂鍒嗙被
sysUser.setBelongDepts(list);
+ Map<String, Object> satisfactionCategories = new HashMap<>();
+ //璁剧疆褰撳墠鐢ㄦ埛鐨勫０闊抽棶棰樺垎绫诲拰闂嵎闂鍒嗙被
+ IUserExtInfoService userExtInfoService3 = SpringUtils.getBean(IUserExtInfoService.class);
+ sysUser.setSatisfactionCategories(userExtInfoService3.getSatisfactionCategories(sysUser.getOrgid()));
}
return sysUser;
}
@@ -272,7 +298,23 @@
@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]);
+
+ //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌锟�?
+ IUserExtInfoService userExtInfoService2 = SpringUtils.getBean(IUserExtInfoService.class);
+ Map<String, String> userOrgInfo2 = userExtInfoService2.getUserOrgInfo(
+ sysUser.getUserId().toString(),
+ split[1],
+ split[3]);
+ if (!userOrgInfo2.isEmpty()) {
+ sysUser.setOrgid(userOrgInfo2.get("orgid"));
+ sysUser.setCampusid(userOrgInfo2.get("campusid"));
+ }
+
+ log.info("selectUserByUserNameAndDeptId鐨剆ysUser鐨勫�间负锛歿}", sysUser);
if (Objects.isNull(sysUser)) return sysUser;
List<SysDept> sysDepts = null;
if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
@@ -396,7 +438,7 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 缁撴灉
*/
@Override
@@ -411,7 +453,7 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 缁撴灉
*/
@Override
@@ -432,7 +474,7 @@
@Override
public String checkUserNameUnique(SysUser user) {
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkUserNameUnique(user.getUserName());
+ SysUser info = userMapper.checkUserNameUnique(user);
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -484,7 +526,7 @@
}
/**
- * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈锟�?
*
* @param userId 鐢ㄦ埛id
*/
@@ -495,7 +537,7 @@
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users)) {
- throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁");
}
}
}
@@ -511,79 +553,21 @@
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
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);
- }
- }
- // 鏂板鐢ㄦ埛宀椾綅鍏宠仈
- insertUserPost(user);
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- insertUserRole(user);
- return rows;
- }
-
- /**
- * 娉ㄥ唽鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉
- */
- @Override
- public boolean registerUser(SysUser user) {
- return userMapper.insertUser(user) > 0;
- }
-
- /**
- * 淇敼淇濆瓨鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉
- */
- @Override
- @Transactional
- public int updateUser(SysUser user) {
- Long userId = user.getUserId();
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- insertUserRole(user);
- // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
- userPostMapper.deleteUserPostByUserId(userId);
- // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
- insertUserPost(user);
- //鍒犻櫎鐢ㄦ埛涓庨儴闂ㄧ殑鍏宠仈
- Long[] ids = {user.getUserId()};
- //鏂板鐢ㄦ埛涓庨儴闂ㄥ叧鑱�
-// sysUserDeptMapper.deleteSysUserDeptByIds(ids);
+ //鏂板鐢ㄦ埛涓庨儴闂ㄥ叧锟�?
// if (!CollectionUtils.isEmpty(user.getDepts())) {
// for (Long deptId : user.getDepts()) {
// SysUserDept sysUserDep = new SysUserDept();
// sysUserDep.setUserId(user.getUserId());
// sysUserDep.setDeptId(deptId);
-// //鏌ヨ鏄惁 宸茬粡鍏宠仈璇ラ儴闂�
-// List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDep);
-// if (!CollectionUtils.isEmpty(sysUserDepts)) {
-// SysUserDept sysUserDept = sysUserDepts.get(0);
-// sysUserDept.setDelFlag(0L);
-// sysUserDeptMapper.updateSysUserDept(sysUserDept);
-// continue;
-// }
// 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);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("1", user.getOrgid(), deptCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -609,7 +593,116 @@
}
if (!CollectionUtils.isEmpty(user.getWardCodes())) {
for (String wardCode : user.getWardCodes()) {
- SysDept sysDept = sysDeptMapper.selectDeptByCode(wardCode);
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("2", user.getOrgid(), 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);
+ }
+ }
+ // 鏂板鐢ㄦ埛宀椾綅鍏宠仈
+ insertUserPost(user);
+ // 鏂板鐢ㄦ埛涓庤鑹茬锟�?
+ insertUserRole(user);
+ return rows;
+ }
+
+ /**
+ * 娉ㄥ唽鐢ㄦ埛淇℃伅
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ public boolean registerUser(SysUser user) {
+ return userMapper.insertUser(user) > 0;
+ }
+
+ /**
+ * 淇敼淇濆瓨鐢ㄦ埛淇℃伅
+ *
+ * @param user 鐢ㄦ埛淇℃伅
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional
+ public int updateUser(SysUser user) {
+ Long userId = user.getUserId();
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
+ userRoleMapper.deleteUserRoleByUserId(userId);
+ // 鏂板鐢ㄦ埛涓庤鑹茬锟�?
+ insertUserRole(user);
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧锟�?
+ userPostMapper.deleteUserPostByUserId(userId);
+ // 鏂板鐢ㄦ埛涓庡矖浣嶇锟�?
+ insertUserPost(user);
+ //鍒犻櫎鐢ㄦ埛涓庨儴闂ㄧ殑鍏宠仈
+ Long[] ids = {user.getUserId()};
+ //鏂板鐢ㄦ埛涓庨儴闂ㄥ叧锟�?
+// sysUserDeptMapper.deleteSysUserDeptByIds(ids);
+// if (!CollectionUtils.isEmpty(user.getDepts())) {
+// for (Long deptId : user.getDepts()) {
+// SysUserDept sysUserDep = new SysUserDept();
+// sysUserDep.setUserId(user.getUserId());
+// sysUserDep.setDeptId(deptId);
+// //鏌ヨ鏄惁 宸茬粡鍏宠仈璇ラ儴锟�?
+// List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDep);
+// if (!CollectionUtils.isEmpty(sysUserDepts)) {
+// SysUserDept sysUserDept = sysUserDepts.get(0);
+// sysUserDept.setDelFlag(0L);
+// sysUserDeptMapper.updateSysUserDept(sysUserDept);
+// continue;
+// }
+// sysUserDep.setCreateTime(new Date());
+// sysUserDep.setUpdateTime(new Date());
+// sysUserDeptMapper.insertSysUserDept(sysUserDep);
+// }
+// }
+ if (!CollectionUtils.isEmpty(user.getDeptCodes())) {
+ for (String deptCode : user.getDeptCodes()) {
+ SysDept sysDept = sysDeptMapper.selectDeptByCode("1", user.getOrgid(), 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("2", user.getOrgid(), wardCode);
if (ObjectUtils.isEmpty(sysDept)) {
continue;
}
@@ -639,7 +732,7 @@
* 鐢ㄦ埛鎺堟潈瑙掕壊
*
* @param userId 鐢ㄦ埛ID
- * @param roleIds 瑙掕壊缁�
+ * @param roleIds 瑙掕壊锟�?
*/
@Override
@Transactional
@@ -649,7 +742,7 @@
}
/**
- * 淇敼鐢ㄦ埛鐘舵��
+ * 淇敼鐢ㄦ埛鐘讹拷?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
@@ -673,7 +766,7 @@
/**
* 淇敼鐢ㄦ埛澶村儚
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
@@ -696,7 +789,7 @@
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @param password 瀵嗙爜
* @return 缁撴灉
*/
@@ -722,7 +815,7 @@
public void insertUserPost(SysUser user) {
Long[] posts = user.getPostIds();
if (StringUtils.isNotEmpty(posts)) {
- // 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
+ // 鏂板鐢ㄦ埛涓庡矖浣嶇锟�?
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
for (Long postId : posts) {
SysUserPost up = new SysUserPost();
@@ -739,11 +832,11 @@
* 鏂板鐢ㄦ埛瑙掕壊淇℃伅
*
* @param userId 鐢ㄦ埛ID
- * @param roleIds 瑙掕壊缁�
+ * @param roleIds 瑙掕壊锟�?
*/
public void insertUserRole(Long userId, Long[] roleIds, String orgid) {
if (StringUtils.isNotEmpty(roleIds)) {
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ // 鏂板鐢ㄦ埛涓庤鑹茬锟�?
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
for (Long roleId : roleIds) {
SysUserRole ur = new SysUserRole();
@@ -765,7 +858,7 @@
@Override
@Transactional
public int deleteUserById(Long userId) {
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
userRoleMapper.deleteUserRoleByUserId(userId);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
userPostMapper.deleteUserPostByUserId(userId);
@@ -785,9 +878,9 @@
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
userRoleMapper.deleteUserRole(userIds);
- // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧锟�?
userPostMapper.deleteUserPost(userIds);
return userMapper.deleteUserByIds(userIds);
}
@@ -803,7 +896,7 @@
@Override
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
if (StringUtils.isNull(userList) || userList.size() == 0) {
- throw new ServiceException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖锛�");
+ throw new ServiceException("瀵煎叆鐢ㄦ埛鏁版嵁涓嶈兘涓虹┖");
}
int successNum = 0;
int failureNum = 0;
@@ -820,7 +913,7 @@
user.setCreateBy(operName);
this.insertUser(user);
successNum++;
- successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
+ successMsg.append("<br/>" + successNum + "銆佽处锟�?" + user.getUserName() + " 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
BeanValidators.validateWithException(validator, user);
checkUserAllowed(user);
@@ -828,14 +921,14 @@
user.setUpdateBy(operName);
this.updateUser(user);
successNum++;
- successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊鎴愬姛");
+ successMsg.append("<br/>" + successNum + "璐﹀彿?" + user.getUserName() + " 鏇存柊鎴愬姛");
} else {
failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 宸插瓨鍦�");
+ failureMsg.append("<br/>" + failureNum + "璐﹀彿" + user.getUserName() + " 宸插瓨鍦�");
}
} catch (Exception e) {
failureNum++;
- String msg = "<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛�";
+ String msg = "<br/>" + failureNum + "璐﹀彿" + user.getUserName() + " 瀵煎叆澶辫触";
failureMsg.append(msg + e.getMessage());
log.error(msg, e);
}
@@ -844,7 +937,7 @@
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
throw new ServiceException(failureMsg.toString());
} else {
- successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + successNum + " 鏉★紝鏁版嵁濡備笅锛�");
+ successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏�" + successNum + "鏉★紝鏁版嵁濡備笅锛�");
}
return successMsg.toString();
}
--
Gitblit v1.9.3