From 4c0da4f99ca97d2cfcaa00fd5cd9c3d69d089bfa Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 22 四月 2026 19:39:04 +0800
Subject: [PATCH] 获取subid
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 157 +++++++++++++++++++---------------------------------
1 files changed, 57 insertions(+), 100 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 f0d170c..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,17 +14,12 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
-import com.smartor.domain.IvrLibaScriptAssort;
-import com.smartor.domain.SvyLibScriptCategory;
-import com.smartor.domain.SvyTaskVO;
-import com.smartor.domain.SysUserOrg;
-import com.smartor.mapper.IvrLibaScriptAssortMapper;
-import com.smartor.mapper.SvyLibScriptCategoryMapper;
-import com.smartor.mapper.SysUserDeptMapper;
-import com.smartor.mapper.SysUserOrgMapper;
+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;
@@ -36,7 +31,7 @@
import java.util.stream.Collectors;
/**
- * 鐢ㄦ埛 涓氬姟灞傚鐞�
+ * 鐢ㄦ埛 涓氬姟灞傚锟�?
*
* @author ruoyi
*/
@@ -48,19 +43,12 @@
private SysUserMapper userMapper;
@Autowired
- private SysUserOrgMapper sysUserOrgMapper;
-
- @Autowired
private SysDeptMapper sysDeptMapper;
@Autowired
+ @Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
- @Autowired
- private IvrLibaScriptAssortMapper ivrLibaScriptAssortMapper;
-
- @Autowired
- private SvyLibScriptCategoryMapper svyLibScriptCategoryMapper;
@Autowired
private SysRoleMapper roleMapper;
@@ -102,7 +90,7 @@
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪锟�?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
@@ -114,7 +102,7 @@
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪锟�?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
@@ -126,9 +114,9 @@
}
/**
- * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
+ * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤锟�?
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
@@ -190,15 +178,15 @@
String[] split = userName.split("&");
SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
- //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
- SysUserOrg sysUserOrg = new SysUserOrg();
- sysUserOrg.setUserId(sysUser.getUserId().toString());
- sysUserOrg.setOrgid(split[1].equals("null") ? "" : split[1]);
- sysUserOrg.setCampusid(split[2].equals("null") ? "" : split[2]);
- List<SysUserOrg> sysUserOrgs = sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
- if (!CollectionUtils.isEmpty(sysUserOrgs)) {
- sysUser.setOrgid(sysUserOrgs.get(0).getOrgid());
- sysUser.setCampusid(sysUserOrgs.get(0).getCampusid());
+ //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌锟�?
+ 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;
@@ -300,40 +288,9 @@
//鑾峰彇褰撳墠鏈烘瀯鐨勬弧鎰忓害闂鍒嗙被
sysUser.setBelongDepts(list);
Map<String, Object> satisfactionCategories = new HashMap<>();
- //鑾峰彇璇煶闂鍒嗙被
- IvrLibaScriptAssort ivrLibaScriptAssort = new IvrLibaScriptAssort();
- ivrLibaScriptAssort.setOrgid(sysUser.getOrgid());
- ivrLibaScriptAssort.setType("myd");
- List<IvrLibaScriptAssort> ivrLibaScriptAssorts = ivrLibaScriptAssortMapper.selectIvrLibaScriptAssortList(ivrLibaScriptAssort);
- List<Map<String, Object>> categoryList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(ivrLibaScriptAssorts)) {
- for (IvrLibaScriptAssort assort : ivrLibaScriptAssorts) {
- Map<String, Object> map = new HashMap<>();
- map.put("categoryid", assort.getId());
- map.put("categoryName", assort.getIndexAssortName());
- categoryList.add(map);
- }
- }
- satisfactionCategories.put("voiceCategories", categoryList);
-
- //鑾峰彇闂嵎闂鍒嗙被
- SvyLibScriptCategory svyLibScriptCategory = new SvyLibScriptCategory();
- svyLibScriptCategory.setOrgid(sysUser.getOrgid());
- svyLibScriptCategory.setType("myd");
- List<SvyLibScriptCategory> svyLibScriptCategories = svyLibScriptCategoryMapper.selectSvyLibScriptCategoryList(svyLibScriptCategory);
- List<Map<String, Object>> questionnaireCategorys = new ArrayList<>();
- if (!CollectionUtils.isEmpty(svyLibScriptCategories)) {
- for (SvyLibScriptCategory scriptCategory : svyLibScriptCategories) {
- Map<String, Object> map = new HashMap<>();
- map.put("categoryid", scriptCategory.getId());
- map.put("categoryName", scriptCategory.getName());
- questionnaireCategorys.add(map);
- }
- }
- satisfactionCategories.put("questionnaireCategorys", CollectionUtils.isEmpty(questionnaireCategorys) ? null : questionnaireCategorys);
-
//璁剧疆褰撳墠鐢ㄦ埛鐨勫０闊抽棶棰樺垎绫诲拰闂嵎闂鍒嗙被
- sysUser.setSatisfactionCategories(satisfactionCategories);
+ IUserExtInfoService userExtInfoService3 = SpringUtils.getBean(IUserExtInfoService.class);
+ sysUser.setSatisfactionCategories(userExtInfoService3.getSatisfactionCategories(sysUser.getOrgid()));
}
return sysUser;
}
@@ -346,15 +303,15 @@
}
SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], split[2]);
- //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌鍖�
- SysUserOrg sysUserOrg = new SysUserOrg();
- sysUserOrg.setUserId(sysUser.getUserId().toString());
- sysUserOrg.setOrgid(split[1].equals("null") ? "" : split[1]);
- sysUserOrg.setCampusid(split[3].equals("null") ? "" : split[3]);
- List<SysUserOrg> sysUserOrgs = sysUserOrgMapper.selectSysUserOrgList(sysUserOrg);
- if (!CollectionUtils.isEmpty(sysUserOrgs)) {
- sysUser.setOrgid(sysUserOrgs.get(0).getOrgid());
- sysUser.setCampusid(sysUserOrgs.get(0).getCampusid());
+ //鑾峰彇褰撳墠鐧婚檰浜虹殑鏈烘瀯鍜岄櫌锟�?
+ 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);
@@ -481,7 +438,7 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 缁撴灉
*/
@Override
@@ -496,7 +453,7 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 缁撴灉
*/
@Override
@@ -569,7 +526,7 @@
}
/**
- * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈锟�?
*
* @param userId 鐢ㄦ埛id
*/
@@ -580,7 +537,7 @@
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users)) {
- throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁");
}
}
}
@@ -596,7 +553,7 @@
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
int rows = userMapper.insertUser(user);
- //鏂板鐢ㄦ埛涓庨儴闂ㄥ叧鑱�
+ //鏂板鐢ㄦ埛涓庨儴闂ㄥ叧锟�?
// if (!CollectionUtils.isEmpty(user.getDepts())) {
// for (Long deptId : user.getDepts()) {
// SysUserDept sysUserDep = new SysUserDept();
@@ -661,7 +618,7 @@
}
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ // 鏂板鐢ㄦ埛涓庤鑹茬锟�?
insertUserRole(user);
return rows;
}
@@ -687,24 +644,24 @@
@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);
@@ -775,7 +732,7 @@
* 鐢ㄦ埛鎺堟潈瑙掕壊
*
* @param userId 鐢ㄦ埛ID
- * @param roleIds 瑙掕壊缁�
+ * @param roleIds 瑙掕壊锟�?
*/
@Override
@Transactional
@@ -785,7 +742,7 @@
}
/**
- * 淇敼鐢ㄦ埛鐘舵��
+ * 淇敼鐢ㄦ埛鐘讹拷?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
@@ -809,7 +766,7 @@
/**
* 淇敼鐢ㄦ埛澶村儚
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
@@ -832,7 +789,7 @@
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @param password 瀵嗙爜
* @return 缁撴灉
*/
@@ -858,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();
@@ -875,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();
@@ -901,7 +858,7 @@
@Override
@Transactional
public int deleteUserById(Long userId) {
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
userRoleMapper.deleteUserRoleByUserId(userId);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
userPostMapper.deleteUserPostByUserId(userId);
@@ -921,9 +878,9 @@
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
userRoleMapper.deleteUserRole(userIds);
- // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧锟�?
userPostMapper.deleteUserPost(userIds);
return userMapper.deleteUserByIds(userIds);
}
@@ -939,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;
@@ -956,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);
@@ -964,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);
}
@@ -980,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