From 7070ffa6b493e75f79fe802dfc047ba3869d7b08 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 25 八月 2024 21:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index bfd8dbb..5f2914d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -17,6 +18,9 @@
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfAncestorService;
import com.ruoyi.service.ZfFamilyService;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +77,9 @@
@Resource
private ZfAncestorService zfAncestorService;
+
+ @Resource
+ private SysUserRoleMapper sysUserRoleMapper;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@@ -81,6 +88,8 @@
public TableDataInfo list(SysUser user)
{
startPage();
+ System.out.println(user.getClanId());
+ System.out.println("----------------++++++++++++==0------------");
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
}
@@ -121,7 +130,7 @@
@GetMapping(value = { "/", "/{userId}" })
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
{
- userService.checkUserDataScope(userId);
+ // userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = roleService.selectRoleAll();
//濡傛灉鏄痑dmin鍒欑洿鎺ヨ繑鍥炴墍鏈夌殑瑙掕壊锛屽惁鍒欏氨杩斿洖涓嶆槸绠＄悊鍛樼殑瑙掕壊淇℃伅
@@ -158,6 +167,9 @@
// System.out.println(user.getFamilyId());
// System.out.println("[[[[]]]]]]");
+ Long userId = user.getSysId();
+ SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId);
+ if (sysUserRole.getRoleId() == 102){
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
infoUser.setOldName(user.getUserName());
@@ -168,6 +180,8 @@
infoUser.setSex(Integer.valueOf(user.getSex()));
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
+
+
if(user.getSpouseId()!=null) {
infoUser.setSpouseId(user.getSpouseId());
}
@@ -207,7 +221,7 @@
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
zInfoUserService.updateById(zu);
- }
+ }}
// zInfoUserService.update(infoUser);
// .saveOrUpdate(infoUser);
@@ -234,6 +248,7 @@
user.setSex(userAll.getSex());
user.setRemark(userAll.getRemark());
user.setUpdateBy(userAll.getUpdateBy());
+ user.setClanId(userAll.getClanId());
// user.setSex(userAll.getSex()=="鐢�"?"1":"0");
// user.setPostIds(userAll.getPostIds());
// user.set
@@ -252,10 +267,18 @@
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
userService.insertUser(user);
+
+ //鍐欏埌鐢ㄦ埛涓庤鑹插搴旂殑琛�
+ SysUserRole sysUserRole = new SysUserRole();
+ sysUserRole.setUserId(user.getUserId());
+ sysUserRole.setRoleId(user.getRoleId());
+ List<SysUserRole> sysUserRoles = new ArrayList<>();
+ sysUserRoles.add(sysUserRole);
+ sysUserRoleMapper.batchUserRole(sysUserRoles);
+
//鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
-
-
// ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
+ if (userAll.getRoleId() == 102){
ZInfoUser infoUser = new ZInfoUser();
infoUser.setSysId(user.getUserId());
// infoUser.setUserId(user.getUserId());
@@ -293,7 +316,8 @@
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
if (father.getIsMyFamily() == 1){
infoUser.setFamilyId(father.getFamilyId());
- infoUser.setClanId(father.getClanId());}
+ infoUser.setClanId(father.getClanId());
+ }
else if (mother.getIsMyFamily() == 1){
infoUser.setFamilyId(mother.getFamilyId());
infoUser.setClanId(mother.getClanId());
@@ -312,6 +336,7 @@
// infoUser.setRoleName(user.g);
// if(userAll.getFamilyId()!=-1) {
+
if(userAll.getRoleId()==102) {
infoUser.setRoleId(3L);
zInfoUserService.save(infoUser);
@@ -323,6 +348,7 @@
zInfoUserService.updateById(zu);
}
}
+ }
// zInfoUserService.saveOrUpdate(infoUser);
// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
--
Gitblit v1.9.1