From f34203dacf5485b06d9d80618e5e14cf4463c2d7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:06 +0800
Subject: [PATCH] 修改了增加，修改用户代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 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 2d590f8..3697614 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfFamily;
+import com.ruoyi.domain.sysUserAndUserInfo;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import org.apache.commons.lang3.ArrayUtils;
@@ -132,6 +133,42 @@
}
/**
+ * 淇敼鐢ㄦ埛
+ *
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateUserInfo")
+ public AjaxResult editUser(@Validated @RequestBody sysUserAndUserInfo user)
+ {
+ SysUser us = new SysUser();
+ us.setUserId(user.getSysId());
+ us.setNickName(user.getNickName());
+ us.setRoleId(user.getRoleId());
+ us.setSex(user.getSex());
+ us.setStatus(user.getStatus());
+ userService.updateUser(us);
+
+ System.out.println(user.getFamilyId());
+ // System.out.println("[[[[]]]]]]");
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setUserId(user.getUserId());
+ infoUser.setIsMyFamily(user.getIsMyFamily());
+ infoUser.setFamilyId(user.getFamilyId());
+ infoUser.setSysId(user.getSysId());
+ if(user.getSpouseId()!=null)
+ infoUser.setSpouseId(user.getSpouseId());
+ ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
+ if(zfFamily!=null&&zfFamily.getFid()!=null)
+ infoUser.setFatherId(zfFamily.getFid());
+ if(zfFamily!=null&&zfFamily.getMid()!=null)
+ infoUser.setMomId(zfFamily.getMid());
+ zInfoUserService.saveOrUpdate(infoUser);
+ // zInfoUserService.update(infoUser);
+ // .saveOrUpdate(infoUser);
+ return AjaxResult.success();
+ }
+ /**
* 鏂板鐢ㄦ埛
*/
@PreAuthorize("@ss.hasPermi('system:user:add')")
@@ -168,21 +205,28 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ userService.insertUser(user);
//鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
ZInfoUser infoUser = new ZInfoUser();
- infoUser.setUserId(user.getUserId());
+ infoUser.setSysId(user.getUserId());
+ // infoUser.setUserId(user.getUserId());
infoUser.setNickName(user.getNickName());
infoUser.setPhoneNumber(user.getPhonenumber());
infoUser.setSex(user.getSex()=="鐢�"?1:0);
infoUser.setFamilyId(userAll.getFamilyId());
- if(zfFamily!=null) {
+ if(zfFamily!=null&&zfFamily.getFid()!=null) {
infoUser.setFatherId(zfFamily.getFid());
- // infoUser.setMomId(zfFamily.getMid());
+ // infoUser.setMomId(zfFamily.getMid());
+ }
+ if(zfFamily!=null&&zfFamily.getMid()!=null) {
+ infoUser.setFatherId(zfFamily.getMid());
+ // infoUser.setMomId(zfFamily.getMid());
}
System.out.println("-----");
System.out.println(userAll.getIsMyFamily());
+ System.out.println(userAll.getFamilyId());
infoUser.setIsMyFamily(userAll.getIsMyFamily());
if(userAll.getSpouseId()==0)
infoUser.setSpouseId(null);
@@ -194,8 +238,10 @@
if(user.getRoleIds()[0]==102)
infoUser.setRoleId(3L);
// infoUser.setRoleName(user.g);
+
if(userAll.getFamilyId()!=-1) {
- zInfoUserService.saveOrUpdate(infoUser);
+ zInfoUserService.save(infoUser);
+ // zInfoUserService.saveOrUpdate(infoUser);
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());
List<ZInfoUser> lis = zInfoUserService.list(lqw);
@@ -211,7 +257,7 @@
.update();
}
}
- return toAjax(userService.insertUser(user));
+ return AjaxResult.success();
}
/**
@@ -252,6 +298,9 @@
{
return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
+// for(Long uid: userIds) {
+// zInfoUserService.getInfoBysysId();
+// }
zInfoUserService.removeByUserName( userService.findUserNames(userIds));
return toAjax(userService.deleteUserByIds(userIds));
}
--
Gitblit v1.9.1