From 68f85f044cd71cd3db6514c3bf5b5129ed2e3e78 Mon Sep 17 00:00:00 2001
From: zqy <2522236926>
Date: 星期一, 10 六月 2024 23:44:50 +0800
Subject: [PATCH] 家庭小医生的分享
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 ca39bd6..346e91e 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
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
@@ -167,6 +169,7 @@
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
//鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
+
ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
@@ -183,14 +186,30 @@
infoUser.setIsMyFamily(userAll.getIsMyFamily());
if(userAll.getSpouseId()==0)
infoUser.setSpouseId(null);
- else
+ else {
infoUser.setSpouseId(userAll.getSpouseId());
+
+ }
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
if(user.getRoleIds()[0]==102)
infoUser.setRoleId(3L);
// infoUser.setRoleName(user.g);
if(userAll.getFamilyId()!=-1) {
zInfoUserService.saveOrUpdate(infoUser);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());
+ List<ZInfoUser> lis = zInfoUserService.list(lqw);
+ if(lis.size()>0) {
+// ZInfoUser zi = new ZInfoUser();
+// zi.setUserId(userAll.getSpouseId());
+// // UpdateWrapper wrapper = new UpdateWrapper();
+// zi.setSpouseId(lis.get(0).getUserId());
+// System.out.println(userAll.getSpouseId());
+// System.out.println(lis.get(0).getUserId());
+ zInfoUserService.lambdaUpdate().eq(ZInfoUser::getUserId, userAll.getSpouseId())
+ .set(ZInfoUser::getSpouseId, lis.get(0).getUserId())
+ .update();
+ }
}
return toAjax(userService.insertUser(user));
}
@@ -227,13 +246,12 @@
@PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
- public AjaxResult remove(@PathVariable Long[] userIds)
+ public AjaxResult remove(@PathVariable("userIds") Long[] userIds)
{
if (ArrayUtils.contains(userIds, getUserId()))
{
return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
- zInfoUserService.removeByUserName( userService.findUserNames(userIds));
return toAjax(userService.deleteUserByIds(userIds));
}
--
Gitblit v1.9.1