From b39a20d6b37f96e1d44c6c194ce56bd30593e3ad Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 29 八月 2024 22:20:31 +0800
Subject: [PATCH] 登录用用户昵称了
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 16 +++++++++++-----
1 files changed, 11 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 c35bcf9..46d357b 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
@@ -88,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);
}
@@ -128,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鍒欑洿鎺ヨ繑鍥炴墍鏈夌殑瑙掕壊锛屽惁鍒欏氨杩斿洖涓嶆槸绠＄悊鍛樼殑瑙掕壊淇℃伅
@@ -246,12 +248,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))
{
@@ -313,7 +317,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());
@@ -343,7 +348,8 @@
zu.setSpouseId(infoUser.getUserId());
zInfoUserService.updateById(zu);
}
- }}
+ }
+ }
// zInfoUserService.saveOrUpdate(infoUser);
// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
--
Gitblit v1.9.1