Merge remote-tracking branch 'origin/master'

jinquanOu

2024-06-11 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,10 +1,19 @@
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.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 +63,10 @@

    @Autowired
    private ISysPostService postService;

    @Resource
    private ZInfoUserService zInfoUserService;
    @Resource
    private ZfFamilyService zfFamilyService;
    /**
     * 获取用户列表
     */
@@ -125,8 +137,23 @@
    @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,6 +168,49 @@
        }
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        //写入到 新建立的信息表里面

        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
        ZInfoUser infoUser = new ZInfoUser();
        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) {
            infoUser.setFatherId(zfFamily.getFid());
       //     infoUser.setMomId(zfFamily.getMid());
        }
        System.out.println("-----");
        System.out.println(userAll.getIsMyFamily());
        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.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));
    }

@@ -176,7 +246,7 @@
    @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()))
        {