From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 3 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 ac7b368..bb427f2 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
@@ -8,10 +8,13 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
import com.ruoyi.service.ZInfoUserService;
+import com.ruoyi.service.ZfAncestorService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +63,9 @@
private SysUserRoleMapper userRoleMapper;
@Autowired
+ private SysUserRoleMapper sysUserRoleMapper;
+
+ @Autowired
private SysUserPostMapper userPostMapper;
@Autowired
@@ -68,8 +74,13 @@
@Autowired
protected Validator validator;
+ @Autowired
+ private ZfAncestorService zfService;
@Resource
private ZInfoUserService zInfoUserService;
+
+
+
@Override
public List<String> findUserNames(Long[] ids) {
@@ -92,6 +103,11 @@
public List<SysUser> selectUserList(SysUser user)
{
return userMapper.selectUserList(user);
+ }
+
+ @Override
+ public List<SysUser> selectCommonUserList(SysUser user) {
+ return userMapper.selectCommonUserList(user);
}
/**
@@ -130,6 +146,11 @@
public SysUser selectUserByUserName(String userName)
{
return userMapper.selectUserByUserName(userName);
+ }
+
+ @Override
+ public SysUser selectUserByNickName(String nickName) {
+ return userMapper.selectUserByNickName(nickName);
}
/**
@@ -196,6 +217,17 @@
return UserConstants.UNIQUE;
}
+ @Override
+ public boolean checkNickNameUnique(SysUser user) {
+ Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+ SysUser info = userMapper.checkNickNameUnique(user.getNickName());
+ if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+ {
+ return UserConstants.NOT_UNIQUE;
+ }
+ return UserConstants.UNIQUE;
+ }
+
/**
* 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
*
@@ -254,7 +286,16 @@
@Override
public void checkUserDataScope(Long userId)
{
- if (!SysUser.isAdmin(SecurityUtils.getUserId()))
+ //鍒ゆ柇鏄惁鏄鐞嗗憳
+
+ ZfAncestor zfAncestor = new ZfAncestor();
+ zfAncestor.setSysId(userId);
+ zfAncestor = zfService.selectZfAncestor(zfAncestor);
+ System.out.println("---------++++++++____________");
+ System.out.println(zfAncestor);
+ //鍒ゆ柇鏄惁鏄秴绾х鐞嗗憳
+ if(zfAncestor!=null && zfAncestor.getId()==1L && zfAncestor.getRoleId()==0L)
+// if (!SysUser.isAdmin(SecurityUtils.getUserId()))
{
SysUser user = new SysUser();
user.setUserId(userId);
@@ -296,8 +337,16 @@
@Override
public boolean registerUser(SysUser user)
{
- System.out.println(user);
- return userMapper.insertUser(user) > 0;
+ int satisfyCount = userMapper.insertUser(user);
+ if (satisfyCount > 0) {
+ List<SysUserRole> roleList = new ArrayList<>();
+ SysUserRole roleId = new SysUserRole();
+ roleId.setUserId(user.getUserId());
+ roleId.setRoleId(2L);
+ roleList.add(roleId);
+ sysUserRoleMapper.batchUserRole(roleList);
+ }
+ return satisfyCount > 0;
}
/**
@@ -539,6 +588,8 @@
StringBuilder successMsg = new StringBuilder();
StringBuilder failureMsg = new StringBuilder();
String password = configService.selectConfigByKey("sys.user.initPassword");
+ List<SysUserRole> roleList = new ArrayList<>();
+
for (SysUser user : userList)
{
try
@@ -551,7 +602,12 @@
user.setPassword(SecurityUtils.encryptPassword(password));
user.setCreateBy(operName);
this.insertUser(user);
+ SysUserRole roleId = new SysUserRole();
+ roleId.setUserId(user.getUserId());
+ roleId.setRoleId(2L);
+ roleList.add(roleId);
successNum++;
+
successMsg.append("<br/>" + successNum + "銆佽处鍙� " + user.getUserName() + " 瀵煎叆鎴愬姛");
}
else if (isUpdateSupport)
@@ -578,6 +634,7 @@
log.error(msg, e);
}
}
+ sysUserRoleMapper.batchUserRole(roleList);
if (failureNum > 0)
{
failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
--
Gitblit v1.9.1