修改了增加，修改用户代码

feige

2024-06-11 5b603e79b0cae8c071bc67a8ec2920e694ea0d9c

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

@@ -6,10 +6,13 @@
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;
@@ -130,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')")
@@ -166,33 +205,59 @@
        }
        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);
        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);
            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 toAjax(userService.insertUser(user));
        return AjaxResult.success();
    }

    /**
@@ -233,7 +298,10 @@
        {
            return error("当前用户不能删除");
        }
        zInfoUserService.removeByUserName( userService.findUserNames(userIds));
//        for(Long uid: userIds) {
//            zInfoUserService.getInfoBysysId();
//        }
       // zInfoUserService.removeByUserName( userService.findUserNames(userIds));
        return toAjax(userService.deleteUserByIds(userIds));
    }