From 74064b9a7a78eff60d504a6fda32a008630469e8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 17 六月 2025 21:29:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 54c4a1c..b95c2a2 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
@@ -11,7 +11,9 @@
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;
@@ -71,6 +73,8 @@
@Autowired
protected Validator validator;
+ @Autowired
+ private ZfAncestorService zfService;
@Resource
private ZInfoUserService zInfoUserService;
@@ -95,6 +99,11 @@
public List<SysUser> selectUserList(SysUser user)
{
return userMapper.selectUserList(user);
+ }
+
+ @Override
+ public List<SysUser> selectCommonUserList(SysUser user) {
+ return userMapper.selectCommonUserList(user);
}
/**
@@ -133,6 +142,11 @@
public SysUser selectUserByUserName(String userName)
{
return userMapper.selectUserByUserName(userName);
+ }
+
+ @Override
+ public SysUser selectUserByNickName(String nickName) {
+ return userMapper.selectUserByNickName(nickName);
}
/**
@@ -199,6 +213,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;
+ }
+
/**
* 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
*
@@ -258,7 +283,15 @@
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);
--
Gitblit v1.9.1