From de1823591a01addd54cb1aab4d78397dcb020472 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 07 十月 2024 23:14:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 159 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 123 insertions(+), 36 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 50fef41..5546b45 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;
@@ -11,10 +12,15 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfAncestor;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.sysUserAndUserInfo;
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;
@@ -68,6 +74,12 @@
private ZInfoUserService zInfoUserService;
@Resource
private ZfFamilyService zfFamilyService;
+
+ @Resource
+ private ZfAncestorService zfAncestorService;
+
+ @Resource
+ private SysUserRoleMapper sysUserRoleMapper;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@@ -76,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);
}
@@ -116,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鍒欑洿鎺ヨ繑鍥炴墍鏈夌殑瑙掕壊锛屽惁鍒欏氨杩斿洖涓嶆槸绠＄悊鍛樼殑瑙掕壊淇℃伅
@@ -153,6 +167,12 @@
// System.out.println(user.getFamilyId());
// System.out.println("[[[[]]]]]]");
+ Long userId = user.getSysId();
+ // SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId);
+ //System.out.println(sysUserRole.getRoleId());
+ System.out.println("浣犲ソ鍛�");
+ System.out.println(user.getRoleId());
+ if (user.getRoleId().equals(102L)){
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
infoUser.setOldName(user.getUserName());
@@ -160,8 +180,11 @@
infoUser.setIsMyFamily(user.getIsMyFamily());
infoUser.setMomId(user.getMid());
infoUser.setFatherId(user.getFid());
+ infoUser.setSex(Integer.valueOf(user.getSex()));
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
+
+
if(user.getSpouseId()!=null) {
infoUser.setSpouseId(user.getSpouseId());
}
@@ -171,35 +194,72 @@
// if(zfFamily!=null&&zfFamily.getMid()!=null)
// infoUser.setMomId(zfFamily.getMid());
- if (user.getFid() != null){
- ZInfoUser father = zInfoUserService.getById(user.getFid());
- if (father.getIsMyFamily() == 1)
- System.out.println("11111111111111111111111111111111/");
- infoUser.setFamilyId(father.getFamilyId());
- }
- else if(user.getMid() != null){
- ZInfoUser mother = zInfoUserService.getById(user.getMid());
- if (mother.getIsMyFamily() == 1)
- System.out.println("2222222222222222222222222222222222/");
- infoUser.setFamilyId(mother.getFamilyId());
- }
-// else if (user.getSpouseId()!=null) {
-// ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
-// System.out.println("33333333333333333333333333333333333333333/");
-// infoUser.setFamilyId(spouse.getFamilyId());
-// infoUser.setSpouseId(user.getSpouseId());
-// }
+ if (user.getFid() != null){
+ //璺熼殢鐖朵翰鐨勫鏃忓拰瀹跺涵淇℃伅
+ // if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+ ZInfoUser father = zInfoUserService.getById(user.getFid());
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(father.getFamilyId());
+ infoUser.setClanId(father.getClanId());
- zInfoUserService.saveOrUpdate(infoUser);
+ // }
+ }
+
+ if(user.getMid()!=null)
+ {
+ //璺熼殢姣嶄翰鐨勫鏃忓拰瀹跺涵淇℃伅
+ // if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
+ ZInfoUser mother = zInfoUserService.getById(user.getMid());
+ System.out.println("11111111111111111111111111111111/");
+ infoUser.setFamilyId(mother.getFamilyId());
+ infoUser.setClanId(mother.getClanId());
+ }
+// else if(user.getMid() != null){
+// ZInfoUser mother = zInfoUserService.getById(user.getMid());
+// if (mother.getIsMyFamily() == 1)
+// System.out.println("2222222222222222222222222222222222/");
+// infoUser.setFamilyId(mother.getFamilyId());
+// }
+ if (user.getSpouseId() != null){
+// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
+
+ //鏄湰瀹�
+ if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
+ ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
+ System.out.println("33333333333333333333333333333333333333333/");
+ infoUser.setFamilyId(spouse.getFamilyId());
+ infoUser.setClanId(spouse.getClanId());
+// }
+ }}
+ if(infoUser.getFamilyId()!=null)
+ zInfoUserService.saveOrUpdate(infoUser);
+ else {
+ System.out.println("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ }
+ //鏇存柊閰嶅伓淇℃伅
if(user.getSpouseId()!=null) {
ZInfoUser zu = new ZInfoUser();
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
+ Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
+ Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
+ zu.setMomId(spouseMoM);
+ zu.setFatherId(spouseDad);
+
zInfoUserService.updateById(zu);
}
+
+ return AjaxResult.success();
+ }
+ else {
+ System.out.println("daniuni");
+ return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ }
+
// zInfoUserService.update(infoUser);
// .saveOrUpdate(infoUser);
- return AjaxResult.success();
+
}
/**
* 鏂板鐢ㄦ埛
@@ -222,12 +282,14 @@
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
- if (!userService.checkUserNameUnique(user))
+
+ if (!userService.checkNickNameUnique(user))
{
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ return error("鏂板鐢ㄦ埛'" + user.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
@@ -240,16 +302,29 @@
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());
infoUser.setNickName(userAll.getNickName());
infoUser.setOldName(userAll.getUserName());
infoUser.setPhoneNumber(userAll.getPhonenumber());
- infoUser.setSex(userAll.getSex()=="鐢�"?1:0);
+ System.out.println(userAll.getSex());
+ System.out.println("鎬у埆鐨勫師鍥�");
+
+ infoUser.setSex(userAll.getSex().equals("0")?0:1);
+ System.out.println(infoUser.getSex());
// infoUser.setFamilyId(userAll.getFid());
infoUser.setSpouseId(userAll.getSpouseId());
@@ -278,15 +353,21 @@
if (userAll.getFid() != null && userAll.getMid() != null){
ZInfoUser father = zInfoUserService.getById(userAll.getFid());
ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
- if (father.getIsMyFamily() == 1)
+ if (father.getIsMyFamily() == 1){
infoUser.setFamilyId(father.getFamilyId());
- if (mother.getIsMyFamily() == 1)
+ infoUser.setClanId(father.getClanId());
+ }
+ else if (mother.getIsMyFamily() == 1){
infoUser.setFamilyId(mother.getFamilyId());
+ infoUser.setClanId(mother.getClanId());
+
}
-// else {
-// ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
-// infoUser.setFamilyId(spouse.getFamilyId());
-// }
+ }
+ else {
+ ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
+ infoUser.setFamilyId(spouse.getFamilyId());
+ infoUser.setClanId(spouse.getClanId());
+ }
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
// if(user.getRoleIds()[0]==102)
@@ -294,7 +375,8 @@
// infoUser.setRoleName(user.g);
// if(userAll.getFamilyId()!=-1) {
- if(userAll.getRoleId()==102) {
+
+ if(userAll.getRoleId().equals(102L)) {
infoUser.setRoleId(3L);
zInfoUserService.save(infoUser);
if(userAll.getSpouseId()!=null)
@@ -302,8 +384,13 @@
ZInfoUser zu = new ZInfoUser();
zu.setUserId(userAll.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
+ Long spouseMoM = zInfoUserService.getById(userAll.getSpouseId()).getMomId();
+ Long spouseDad = zInfoUserService.getById(userAll.getSpouseId()).getFatherId();
+ zu.setMomId(spouseMoM);
+ zu.setFatherId(spouseDad);
zInfoUserService.updateById(zu);
}
+ }
}
// zInfoUserService.saveOrUpdate(infoUser);
@@ -335,9 +422,9 @@
{
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());
- if (!userService.checkUserNameUnique(user))
+ if (!userService.checkNickNameUnique(user))
{
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ return error("淇敼鐢ㄦ埛'" + user.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
@@ -378,8 +465,8 @@
@PutMapping("/resetPwd")
public AjaxResult resetPwd(@RequestBody SysUser user)
{
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
+ // userService.checkUserAllowed(user);
+// userService.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
user.setUpdateBy(getUsername());
return toAjax(userService.resetPwd(user));
--
Gitblit v1.9.1