From 08f95b2f159b56fa3bd4f4b348855989de8aa456 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 18 十二月 2025 21:48:18 +0800
Subject: [PATCH] feat: vehicle
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 168 ++++++++++++++++++++++++++-----------------------------
1 files changed, 79 insertions(+), 89 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 90b745b..8f10be9 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
@@ -4,6 +4,9 @@
import java.util.List;
import java.util.stream.Collectors;
import javax.validation.Validator;
+
+import com.ruoyi.common.utils.UserUtil;
+import com.ruoyi.system.service.ISysDeptService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +31,6 @@
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
/**
@@ -60,10 +62,9 @@
private ISysConfigService configService;
@Autowired
- private ISysDeptService deptService;
-
- @Autowired
protected Validator validator;
+ @Autowired
+ private ISysDeptService sysDeptService;
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ鐢ㄦ埛鍒楄〃
@@ -127,18 +128,6 @@
{
return userMapper.selectUserByPhonenumber(phonenumber);
}
-
- /**
- * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
- *
- * @param userId 鐢ㄦ埛ID
- * @return 鐢ㄦ埛瀵硅薄淇℃伅
- */
- @Override
- public SysUser selectUserById(Long userId)
- {
- return userMapper.selectUserById(userId);
- }
/**
* 閫氳繃寰俊OpenID鏌ヨ鐢ㄦ埛
@@ -153,6 +142,18 @@
}
/**
+ * 閫氳繃浼佷笟寰俊鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
+ *
+ * @param qyWechatUserId 浼佷笟寰俊鐢ㄦ埛ID
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ @Override
+ public SysUser selectUserByQyWechatUserId(String qyWechatUserId)
+ {
+ return userMapper.selectUserByQyWechatUserId(qyWechatUserId);
+ }
+
+ /**
* 鏍规嵁oaUserId鏌ヨ鐢ㄦ埛
*
* @param oaUserId SQL Server涓殑OA鐢ㄦ埛ID
@@ -162,6 +163,18 @@
public SysUser selectUserByOaUserId(Integer oaUserId)
{
return userMapper.selectUserByOaUserId(oaUserId);
+ }
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID鏌ヨ鐢ㄦ埛
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 鐢ㄦ埛瀵硅薄淇℃伅
+ */
+ @Override
+ public SysUser selectUserById(Long userId)
+ {
+ return userMapper.selectUserById(userId);
}
/**
@@ -178,7 +191,7 @@
{
return StringUtils.EMPTY;
}
- return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
+ return list.stream().map(SysRole::getRoleName).reduce((x, y) -> x + "," + y).orElse(StringUtils.EMPTY);
}
/**
@@ -205,7 +218,7 @@
* @return 缁撴灉
*/
@Override
- public boolean checkUserNameUnique(SysUser user)
+ public Boolean checkUserNameUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
@@ -223,7 +236,7 @@
* @return
*/
@Override
- public boolean checkPhoneUnique(SysUser user)
+ public Boolean checkPhoneUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
@@ -241,7 +254,7 @@
* @return
*/
@Override
- public boolean checkEmailUnique(SysUser user)
+ public Boolean checkEmailUnique(SysUser user)
{
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
SysUser info = userMapper.checkEmailUnique(user.getEmail());
@@ -402,6 +415,24 @@
return userMapper.updateUser(user);
}
+
+ @Override
+ public Long getBranchCompanyIdByUserId(Long userId) {
+ Long branchId=UserUtil.getBranchIdByUserId(userId);
+ if(branchId!=null)return branchId;
+
+ SysUser u=userMapper.selectUserById(userId);
+ if(u!=null){
+ Long deptId= u.getDeptId();
+ branchId= sysDeptService.getBranchCompany(deptId);
+ if(branchId!=null){
+ UserUtil.addUserIdBranch(userId,branchId);
+ return branchId;
+ }
+ }
+ return null;
+ }
+
/**
* 閲嶇疆鐢ㄦ埛瀵嗙爜
*
@@ -433,10 +464,10 @@
public void insertUserPost(SysUser user)
{
Long[] posts = user.getPostIds();
- if (StringUtils.isNotEmpty(posts))
+ if (StringUtils.isNotNull(posts))
{
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
- List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
+ List<SysUserPost> list = new ArrayList<SysUserPost>();
for (Long postId : posts)
{
SysUserPost up = new SysUserPost();
@@ -444,7 +475,10 @@
up.setPostId(postId);
list.add(up);
}
- userPostMapper.batchUserPost(list);
+ if (list.size() > 0)
+ {
+ userPostMapper.batchUserPost(list);
+ }
}
}
@@ -456,10 +490,10 @@
*/
public void insertUserRole(Long userId, Long[] roleIds)
{
- if (StringUtils.isNotEmpty(roleIds))
+ if (StringUtils.isNotNull(roleIds))
{
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
- List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
+ List<SysUserRole> list = new ArrayList<SysUserRole>();
for (Long roleId : roleIds)
{
SysUserRole ur = new SysUserRole();
@@ -467,7 +501,10 @@
ur.setRoleId(roleId);
list.add(ur);
}
- userRoleMapper.batchUserRole(list);
+ if (list.size() > 0)
+ {
+ userRoleMapper.batchUserRole(list);
+ }
}
}
@@ -501,7 +538,6 @@
for (Long userId : userIds)
{
checkUserAllowed(new SysUser(userId));
- checkUserDataScope(userId);
}
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
userRoleMapper.deleteUserRole(userIds);
@@ -529,6 +565,7 @@
int failureNum = 0;
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
+ String password = configService.selectConfigByKey("sys.user.initPassword");
for (SysUser user : userList)
{
try
@@ -538,73 +575,18 @@
if (StringUtils.isNull(u))
{
BeanValidators.validateWithException(validator, user);
- deptService.checkDeptDataScope(user.getDeptId());
-
- // 鏍￠獙鎵嬫満鍙峰敮涓�鎬�
- if (StringUtils.isNotEmpty(user.getPhonenumber()))
- {
- SysUser phoneCheck = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (StringUtils.isNotNull(phoneCheck))
- {
- failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛氭墜鏈哄彿鐮� " + user.getPhonenumber() + " 宸茶鐢ㄦ埛 " + phoneCheck.getUserName() + " 浣跨敤");
- continue;
- }
- }
-
- // 鏍￠獙閭鍞竴鎬�
- if (StringUtils.isNotEmpty(user.getEmail()))
- {
- SysUser emailCheck = userMapper.checkEmailUnique(user.getEmail());
- if (StringUtils.isNotNull(emailCheck))
- {
- failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆澶辫触锛氶偖绠� " + user.getEmail() + " 宸茶鐢ㄦ埛 " + emailCheck.getUserName() + " 浣跨敤");
- continue;
- }
- }
-
- String password = configService.selectConfigByKey("sys.user.initPassword");
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
- userMapper.insertUser(user);
+ this.insertUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
}
else if (isUpdateSupport)
{
BeanValidators.validateWithException(validator, user);
- checkUserAllowed(u);
- checkUserDataScope(u.getUserId());
- deptService.checkDeptDataScope(user.getDeptId());
-
- // 鏍￠獙鎵嬫満鍙峰敮涓�鎬э紙鎺掗櫎鑷繁锛�
- if (StringUtils.isNotEmpty(user.getPhonenumber()))
- {
- SysUser phoneCheck = userMapper.checkPhoneUnique(user.getPhonenumber());
- if (StringUtils.isNotNull(phoneCheck) && !phoneCheck.getUserId().equals(u.getUserId()))
- {
- failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊澶辫触锛氭墜鏈哄彿鐮� " + user.getPhonenumber() + " 宸茶鐢ㄦ埛 " + phoneCheck.getUserName() + " 浣跨敤");
- continue;
- }
- }
-
- // 鏍￠獙閭鍞竴鎬э紙鎺掗櫎鑷繁锛�
- if (StringUtils.isNotEmpty(user.getEmail()))
- {
- SysUser emailCheck = userMapper.checkEmailUnique(user.getEmail());
- if (StringUtils.isNotNull(emailCheck) && !emailCheck.getUserId().equals(u.getUserId()))
- {
- failureNum++;
- failureMsg.append("<br/>" + failureNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊澶辫触锛氶偖绠� " + user.getEmail() + " 宸茶鐢ㄦ埛 " + emailCheck.getUserName() + " 浣跨敤");
- continue;
- }
- }
-
user.setUserId(u.getUserId());
user.setUpdateBy(operName);
- userMapper.updateUser(user);
+ this.updateUser(user);
successNum++;
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 鏇存柊鎴愬姛");
}
@@ -643,10 +625,18 @@
@Override
public List<SysUser> selectUsersByBranchDeptIds(List<Long> branchDeptIds)
{
- if (branchDeptIds == null || branchDeptIds.isEmpty()) {
- return new ArrayList<>();
- }
-
return userMapper.selectUsersByBranchDeptIds(branchDeptIds);
}
-}
+
+ /**
+ * 鏍规嵁serviceOrderClass鎴杁ispatchOrderClass鏌ヨ鍏锋湁canViewAllConsult鏉冮檺鐨勭敤鎴�
+ *
+ * @param orderClass serviceOrderClass鎴杁ispatchOrderClass
+ * @return 鐢ㄦ埛鍒楄〃
+ */
+ @Override
+ public List<SysUser> selectUsersByOrderClassAndCanViewAllConsult(String orderClass)
+ {
+ return userMapper.selectUsersByOrderClassAndCanViewAllConsult(orderClass);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.1