修改

zqy

2024-08-06 76609b679d91e5e018397f72fb512e7e33f8a153

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -60,6 +60,9 @@
    private SysUserRoleMapper userRoleMapper;

    @Autowired
    private SysUserRoleMapper sysUserRoleMapper;

    @Autowired
    private SysUserPostMapper userPostMapper;

    @Autowired
@@ -296,7 +299,16 @@
    @Override
    public boolean registerUser(SysUser user)
    {
        return userMapper.insertUser(user) > 0;
        int satisfyCount = userMapper.insertUser(user);
        if (satisfyCount > 0) {
            List<SysUserRole> roleList = new ArrayList<>();
            SysUserRole roleId = new SysUserRole();
            roleId.setUserId(user.getUserId());
            roleId.setRoleId(2L);
            roleList.add(roleId);
            sysUserRoleMapper.batchUserRole(roleList);
        }
        return satisfyCount > 0;
    }

    /**
@@ -311,9 +323,9 @@
    {
        Long userId = user.getUserId();
        // 删除用户与角色关联
        userRoleMapper.deleteUserRoleByUserId(userId);
        // 新增用户与角色管理
        insertUserRole(user);
//        userRoleMapper.deleteUserRoleByUserId(userId);
//        // 新增用户与角色管理
//        insertUserRole(user);
        // 删除用户与岗位关联
        userPostMapper.deleteUserPostByUserId(userId);
        // 新增用户与岗位管理
@@ -471,7 +483,7 @@
        userRoleMapper.deleteUserRoleByUserId(userId);
        // 删除用户与岗位表
        userPostMapper.deleteUserPostByUserId(userId);
        return userMapper.deleteUserById(userId);
        return userMapper.deleteById(userId);
    }

    /**
@@ -494,22 +506,22 @@
        // 删除用户与岗位关联
        userPostMapper.deleteUserPost(userIds);
        //找到用户名
        List<String> unames = findUserNames(userIds);
        for(String name :unames) {

        for(long uid : userIds) {
          //  System.out.println(name.equals(""));
         //   System.out.println(name==null);

         //   if(name!="" || name != null) {
                ZInfoUser fs = new ZInfoUser();
                fs.setNickName(name);
                List<ZInfoUser> lis = zInfoUserService.selectByCondition(fs);
                System.out.println("902");
                ZInfoUser fs = zInfoUserService.getInfoBysysId(uid);

                System.out.println(lis.size());
                if (!name.equals("") && lis.size() > 0)
                    userMapper.deleteUserByUserName(name);
                if(fs!=null)
                {
                    userMapper.deleteUserById(uid);
                }
                else
                    userMapper.deleteUserByName(name);
                {
                    userMapper.deleteById(uid);
                }
          //  }
        }

@@ -538,6 +550,8 @@
        StringBuilder successMsg = new StringBuilder();
        StringBuilder failureMsg = new StringBuilder();
        String password = configService.selectConfigByKey("sys.user.initPassword");
        List<SysUserRole> roleList = new ArrayList<>();

        for (SysUser user : userList)
        {
            try
@@ -550,7 +564,12 @@
                    user.setPassword(SecurityUtils.encryptPassword(password));
                    user.setCreateBy(operName);
                    this.insertUser(user);
                    SysUserRole roleId = new SysUserRole();
                    roleId.setUserId(user.getUserId());
                    roleId.setRoleId(2L);
                    roleList.add(roleId);
                    successNum++;
                    
                    successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                }
                else if (isUpdateSupport)
@@ -577,6 +596,7 @@
                log.error(msg, e);
            }
        }
        sysUserRoleMapper.batchUserRole(roleList);
        if (failureNum > 0)
        {
            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");