From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 126 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 123 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 2cb0e8f..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
@@ -1,10 +1,20 @@
package com.ruoyi.web.controller.system;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+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;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,7 +64,10 @@
@Autowired
private ISysPostService postService;
-
+ @Resource
+ private ZInfoUserService zInfoUserService;
+ @Resource
+ private ZfFamilyService zfFamilyService;
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
@@ -120,13 +133,64 @@
}
/**
+ * 淇敼鐢ㄦ埛
+ *
+ */
+ @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')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysUser user)
+ public AjaxResult add(@Validated @RequestBody sysUserInfo userAll)
{
+ SysUser user = new SysUser();
+ user.setUserId(userAll.getUserId());
+ user.setAvatar(userAll.getAvatar());
+ user.setPassword(userAll.getPassword());
+ user.setNickName(userAll.getNickName());
+ user.setUserName(userAll.getUserName());
+ user.setPhonenumber(userAll.getPhonenumber());
+ user.setRoleId(userAll.getRoleId());
+ user.setRoleIds(userAll.getRoleIds());
+ user.setStatus(userAll.getStatus());
+ user.setSex(userAll.getSex());
+ user.setRemark(userAll.getRemark());
+ user.setUpdateBy(userAll.getUpdateBy());
+ user.setPostIds(userAll.getPostIds());
+ // user.set
if (!userService.checkUserNameUnique(user))
{
return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
@@ -141,7 +205,59 @@
}
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- return toAjax(userService.insertUser(user));
+ userService.insertUser(user);
+ //鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
+
+ ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
+ ZInfoUser infoUser = new ZInfoUser();
+ 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&&zfFamily.getFid()!=null) {
+ infoUser.setFatherId(zfFamily.getFid());
+ // 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);
+ else {
+ infoUser.setSpouseId(userAll.getSpouseId());
+
+ }
+ //鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
+ if(user.getRoleIds()[0]==102)
+ infoUser.setRoleId(3L);
+ // infoUser.setRoleName(user.g);
+
+ if(userAll.getFamilyId()!=-1) {
+ zInfoUserService.save(infoUser);
+ // 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 AjaxResult.success();
}
/**
@@ -182,6 +298,10 @@
{
return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
}
+// for(Long uid: userIds) {
+// zInfoUserService.getInfoBysysId();
+// }
+ zInfoUserService.removeByUserName( userService.findUserNames(userIds));
return toAjax(userService.deleteUserByIds(userIds));
}
--
Gitblit v1.9.1