From 1b998cdf41ac4f1e4fec4d9bf076d7da700619c4 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 07 五月 2026 17:41:18 +0800
Subject: [PATCH] 【市一】短信标题调整
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 257 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 162 insertions(+), 95 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 74ba552..1c28e14 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;
@@ -27,10 +28,13 @@
import javax.validation.Validator;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
- * 鐢ㄦ埛 涓氬姟灞傚鐞�
+ * 鐢ㄦ埛 涓氬姟灞傚锟�?
*
* @author ruoyi
*/
@@ -45,7 +49,9 @@
private SysDeptMapper sysDeptMapper;
@Autowired
+ @Qualifier("sysUserDeptSystemMapper")
private SysUserDeptMapper sysUserDeptMapper;
+
@Autowired
private SysRoleMapper roleMapper;
@@ -87,7 +93,7 @@
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪锟�?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
@@ -99,7 +105,7 @@
}
/**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪锟�?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 鐢ㄦ埛淇℃伅闆嗗悎淇℃伅
@@ -111,9 +117,9 @@
}
/**
- * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤鎴�
+ * 閫氳繃鐢ㄦ埛鍚嶆煡璇㈢敤锟�?
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 鐢ㄦ埛瀵硅薄淇℃伅
*/
@Override
@@ -175,74 +181,102 @@
String[] split = userName.split("&");
SysUser sysUser = userMapper.selectUserByUserNameByCondition(split[0], split[1], null);
if (Objects.isNull(sysUser)) return sysUser;
- List<SysDept> sysDepts = null;
- if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
+
+ boolean isAdmin = StringUtils.isNotEmpty(split[0]) && "admin".equals(split[0]);
+ IUserExtInfoService userExtInfoService = SpringUtils.getBean(IUserExtInfoService.class);
+ Executor executor = SpringUtils.getBean("threadPoolTaskExecutor");
+
+ // === 骞惰鏌ヨ: 鐢ㄦ埛鏈烘瀯淇℃伅 + 閮ㄩ棬鍒楄〃 ===
+ CompletableFuture<Map<String, String>> orgInfoFuture = CompletableFuture.supplyAsync(() ->
+ userExtInfoService.getUserOrgInfo(sysUser.getUserId().toString(), split[1], split[2]), executor);
+
+ CompletableFuture<List<SysDept>> deptsFuture;
+ if (isAdmin) {
SysDept dept = new SysDept();
dept.setOrgid(split[1]);
- sysDepts = sysDeptMapper.selectDeptList(dept);
+ deptsFuture = CompletableFuture.supplyAsync(() -> sysDeptMapper.selectDeptList(dept), executor);
} else {
- sysDepts = sysUserDeptMapper.selectDeptListByUserId(sysUser.getUserId());
+ deptsFuture = CompletableFuture.supplyAsync(() -> sysUserDeptMapper.selectDeptListByUserId(sysUser.getUserId()), executor);
}
+
+ // 绛夊緟鏈烘瀯淇℃伅
+ Map<String, String> userOrgInfo = new HashMap<>();
+ try {
+ userOrgInfo = orgInfoFuture.get(5, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ log.warn("鑾峰彇鐢ㄦ埛鏈烘瀯淇℃伅瓒呮椂鎴栧紓甯�", e);
+ }
+ if (!userOrgInfo.isEmpty()) {
+ sysUser.setOrgid(userOrgInfo.get("orgid"));
+ sysUser.setCampusid(userOrgInfo.get("campusid"));
+ }
+
+ // 绛夊緟閮ㄩ棬鍒楄〃
+ List<SysDept> sysDepts = new ArrayList<>();
+ try {
+ sysDepts = deptsFuture.get(5, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ log.warn("鑾峰彇閮ㄩ棬鍒楄〃瓒呮椂鎴栧紓甯�", e);
+ }
+
List<Long> deptIds = new ArrayList<>();
for (SysDept sysDept : sysDepts) {
deptIds.add(sysDept.getDeptId());
}
- SysUserDept sysUserDept = new SysUserDept();
- sysUserDept.setUserId(sysUser.getUserId());
- sysUserDept.setDeptType(sysUser.getSearchscope());
- sysUserDept.setOrgid(split[1]);
+
+ // === 鏌ヨ绉戝鍜岀梾鍖轰俊鎭� ===
List<SysUserDept> sysUserDeptKSs = null;
List<SysUserDept> sysUserDeptBQs = null;
- if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("0")) {
- if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
- sysUserDept.setUserId(null);
- }
- sysUserDept.setDeptType("1");
- sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- sysUserDept.setDeptType("2");
- sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- //濡傛灉鏄痑dmin锛岄渶瑕佸sysUserDeptBQs锛宻ysUserDeptBQs鍘婚噸
- if (StringUtils.isNotEmpty(split[0]) && split[0].equals("admin")) {
- //濡傛灉鏄痑dmin锛屽彧鑳藉幓sys_dept鍘诲彇鏁版嵁
- SysDept dept = new SysDept();
- dept.setOrgid(split[1]);
- dept.setDeptType("1");
- sysDepts = sysDeptMapper.selectDeptList(dept);
- sysUserDeptKSs = DtoConversionUtils.sourceToTarget(sysDepts, SysUserDept.class);
-
- dept.setDeptType("2");
- sysDepts = sysDeptMapper.selectDeptList(dept);
- sysUserDeptBQs = DtoConversionUtils.sourceToTarget(sysDepts, SysUserDept.class);
-
- List<SysUserDept> distinctUserDepts = new ArrayList<>();
- Set<String> uniqueDeptCodes = new HashSet<>();
- for (SysUserDept userDept : sysUserDeptKSs) {
- String deptCode = userDept.getDeptCode();
- if (StringUtils.isNotEmpty(deptCode) && !uniqueDeptCodes.contains(deptCode)) {
- distinctUserDepts.add(userDept);
- uniqueDeptCodes.add(deptCode);
+ if (StringUtils.isNotEmpty(sysUser.getSearchscope())) {
+ if ("0".equals(sysUser.getSearchscope())) {
+ if (isAdmin) {
+ // admin鐩存帴浠巗ys_dept鏌ヨ锛岃烦杩囨棤鎰忎箟鐨剆electSysUserDeptList
+ SysDept deptKS = new SysDept();
+ deptKS.setOrgid(split[1]);
+ deptKS.setDeptType("1");
+ SysDept deptBQ = new SysDept();
+ deptBQ.setOrgid(split[1]);
+ deptBQ.setDeptType("2");
+ CompletableFuture<List<SysDept>> ksFuture = CompletableFuture.supplyAsync(() -> sysDeptMapper.selectDeptList(deptKS), executor);
+ CompletableFuture<List<SysDept>> bqFuture = CompletableFuture.supplyAsync(() -> sysDeptMapper.selectDeptList(deptBQ), executor);
+ try {
+ sysUserDeptKSs = distinctByDeptCode(DtoConversionUtils.sourceToTarget(ksFuture.get(5, TimeUnit.SECONDS), SysUserDept.class));
+ sysUserDeptBQs = distinctByDeptCode(DtoConversionUtils.sourceToTarget(bqFuture.get(5, TimeUnit.SECONDS), SysUserDept.class));
+ } catch (Exception e) {
+ log.warn("鑾峰彇admin绉戝/鐥呭尯淇℃伅瓒呮椂鎴栧紓甯�", e);
+ }
+ } else {
+ // 骞惰鏌ヨ绉戝鍜岀梾鍖�
+ SysUserDept queryKS = new SysUserDept();
+ queryKS.setUserId(sysUser.getUserId());
+ queryKS.setDeptType("1");
+ queryKS.setOrgid(split[1]);
+ SysUserDept queryBQ = new SysUserDept();
+ queryBQ.setUserId(sysUser.getUserId());
+ queryBQ.setDeptType("2");
+ queryBQ.setOrgid(split[1]);
+ CompletableFuture<List<SysUserDept>> ksFuture = CompletableFuture.supplyAsync(() -> sysUserDeptMapper.selectSysUserDeptList(queryKS), executor);
+ CompletableFuture<List<SysUserDept>> bqFuture = CompletableFuture.supplyAsync(() -> sysUserDeptMapper.selectSysUserDeptList(queryBQ), executor);
+ try {
+ sysUserDeptKSs = ksFuture.get(5, TimeUnit.SECONDS);
+ sysUserDeptBQs = bqFuture.get(5, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ log.warn("鑾峰彇绉戝/鐥呭尯淇℃伅瓒呮椂鎴栧紓甯�", e);
}
}
-
- List<SysUserDept> distinctUserBQs = new ArrayList<>();
- Set<String> uniqueBQCodes = new HashSet<>();
- for (SysUserDept userDept : sysUserDeptBQs) {
- String deptCode = userDept.getDeptCode();
- if (StringUtils.isNotEmpty(deptCode) && !uniqueBQCodes.contains(deptCode)) {
- distinctUserBQs.add(userDept);
- uniqueBQCodes.add(deptCode);
- }
- }
- sysUserDeptKSs = distinctUserDepts;
- sysUserDeptBQs = distinctUserBQs;
+ } else if ("1".equals(sysUser.getSearchscope())) {
+ SysUserDept queryKS = new SysUserDept();
+ queryKS.setUserId(sysUser.getUserId());
+ queryKS.setDeptType("1");
+ queryKS.setOrgid(split[1]);
+ sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(queryKS);
+ } else if ("2".equals(sysUser.getSearchscope())) {
+ SysUserDept queryBQ = new SysUserDept();
+ queryBQ.setUserId(sysUser.getUserId());
+ queryBQ.setDeptType("2");
+ queryBQ.setOrgid(split[1]);
+ sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(queryBQ);
}
-
- } else if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("1")) {
- sysUserDept.setDeptType("1");
- sysUserDeptKSs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
- } else if (StringUtils.isNotEmpty(sysUser.getSearchscope()) && sysUser.getSearchscope().equals("2")) {
- sysUserDept.setDeptType("2");
- sysUserDeptBQs = sysUserDeptMapper.selectSysUserDeptList(sysUserDept);
}
sysUser.setDepts(deptIds);
@@ -271,8 +305,29 @@
list.add(map);
}
sysUser.setBelongDepts(list);
+ // 璁剧疆婊℃剰搴﹀垎绫伙紙璧扮紦瀛橈級
+ sysUser.setSatisfactionCategories(userExtInfoService.getSatisfactionCategories(sysUser.getOrgid()));
}
return sysUser;
+ }
+
+ /**
+ * 鎸塪eptCode鍘婚噸
+ */
+ private List<SysUserDept> distinctByDeptCode(List<SysUserDept> list) {
+ if (CollectionUtils.isEmpty(list)) {
+ return list;
+ }
+ List<SysUserDept> result = new ArrayList<>();
+ Set<String> uniqueCodes = new HashSet<>();
+ for (SysUserDept item : list) {
+ String deptCode = item.getDeptCode();
+ if (StringUtils.isNotEmpty(deptCode) && !uniqueCodes.contains(deptCode)) {
+ result.add(item);
+ uniqueCodes.add(deptCode);
+ }
+ }
+ return result;
}
@Override
@@ -282,6 +337,18 @@
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;
@@ -406,7 +473,7 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炶鑹茬粍
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 缁撴灉
*/
@Override
@@ -421,7 +488,7 @@
/**
* 鏌ヨ鐢ㄦ埛鎵�灞炲矖浣嶇粍
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @return 缁撴灉
*/
@Override
@@ -442,7 +509,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;
}
@@ -494,7 +561,7 @@
}
/**
- * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈闄�
+ * 鏍￠獙鐢ㄦ埛鏄惁鏈夋暟鎹潈锟�?
*
* @param userId 鐢ㄦ埛id
*/
@@ -505,7 +572,7 @@
user.setUserId(userId);
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
if (StringUtils.isEmpty(users)) {
- throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁锛�");
+ throw new ServiceException("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁");
}
}
}
@@ -521,7 +588,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();
@@ -535,7 +602,7 @@
// }
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;
}
@@ -561,7 +628,7 @@
}
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;
}
@@ -586,7 +653,7 @@
}
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
- // 鏂板鐢ㄦ埛涓庤鑹茬鐞�
+ // 鏂板鐢ㄦ埛涓庤鑹茬锟�?
insertUserRole(user);
return rows;
}
@@ -612,24 +679,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);
@@ -644,7 +711,7 @@
// }
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;
}
@@ -670,7 +737,7 @@
}
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;
}
@@ -700,7 +767,7 @@
* 鐢ㄦ埛鎺堟潈瑙掕壊
*
* @param userId 鐢ㄦ埛ID
- * @param roleIds 瑙掕壊缁�
+ * @param roleIds 瑙掕壊锟�?
*/
@Override
@Transactional
@@ -710,7 +777,7 @@
}
/**
- * 淇敼鐢ㄦ埛鐘舵��
+ * 淇敼鐢ㄦ埛鐘讹拷?
*
* @param user 鐢ㄦ埛淇℃伅
* @return 缁撴灉
@@ -734,7 +801,7 @@
/**
* 淇敼鐢ㄦ埛澶村儚
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @param avatar 澶村儚鍦板潃
* @return 缁撴灉
*/
@@ -757,7 +824,7 @@
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
*
- * @param userName 鐢ㄦ埛鍚�
+ * @param userName 鐢ㄦ埛锟�?
* @param password 瀵嗙爜
* @return 缁撴灉
*/
@@ -783,7 +850,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();
@@ -800,11 +867,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();
@@ -826,7 +893,7 @@
@Override
@Transactional
public int deleteUserById(Long userId) {
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
userRoleMapper.deleteUserRoleByUserId(userId);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
userPostMapper.deleteUserPostByUserId(userId);
@@ -846,9 +913,9 @@
checkUserAllowed(new SysUser(userId));
checkUserDataScope(userId);
}
- // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庤鑹插叧锟�?
userRoleMapper.deleteUserRole(userIds);
- // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧锟�?
userPostMapper.deleteUserPost(userIds);
return userMapper.deleteUserByIds(userIds);
}
@@ -864,7 +931,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;
@@ -881,7 +948,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);
@@ -889,14 +956,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);
}
@@ -905,7 +972,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