修改bug&分享

zqy

2024-07-30 c35d9c6311b6f9ef75b49559a5c6db75e0a43ac6

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

@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -17,6 +18,9 @@
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfAncestorService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -73,6 +77,9 @@

    @Resource
    private ZfAncestorService zfAncestorService;

    @Resource
    private SysUserRoleMapper sysUserRoleMapper;
    /**
     * 获取用户列表
     */
@@ -158,6 +165,9 @@

  //      System.out.println(user.getFamilyId());
     //   System.out.println("[[[[]]]]]]");
        Long userId = user.getSysId();
        SysUserRole sysUserRole=sysUserRoleMapper.selectUserById(userId);
        if (sysUserRole.getRoleId() == 102){
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setOldName(user.getUserName());
@@ -168,6 +178,8 @@
        infoUser.setSex(Integer.valueOf(user.getSex()));
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());


        if(user.getSpouseId()!=null) {
            infoUser.setSpouseId(user.getSpouseId());
        }
@@ -207,7 +219,7 @@
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());
            zInfoUserService.updateById(zu);
        }
        }}

      //  zInfoUserService.update(infoUser);
             //   .saveOrUpdate(infoUser);
@@ -252,10 +264,18 @@
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        userService.insertUser(user);

        //写到用户与角色对应的表
        SysUserRole sysUserRole = new SysUserRole();
        sysUserRole.setUserId(user.getUserId());
        sysUserRole.setRoleId(user.getRoleId());
        List<SysUserRole> sysUserRoles = new ArrayList<>();
        sysUserRoles.add(sysUserRole);
        sysUserRoleMapper.batchUserRole(sysUserRoles);

        //写入到 新建立的信息表里面


//        ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
        if (userAll.getRoleId() == 102){
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(user.getUserId());
     //   infoUser.setUserId(user.getUserId());
@@ -312,6 +332,7 @@
        // infoUser.setRoleName(user.g);

      //  if(userAll.getFamilyId()!=-1) {

        if(userAll.getRoleId()==102) {
            infoUser.setRoleId(3L);
            zInfoUserService.save(infoUser);
@@ -322,7 +343,7 @@
                zu.setSpouseId(infoUser.getUserId());
                zInfoUserService.updateById(zu);
            }
        }
        }}

        //    zInfoUserService.saveOrUpdate(infoUser);
//            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();