!236 代码小整理 Merge pull request !236 from taest/N/A

若依

2022-08-22 ca36f9fc6e12cb79646aefd2f37d02119479ae40

!236 代码小整理
Merge pull request !236 from taest/N/A

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

@@ -131,7 +131,7 @@


    public boolean getDefault()

    {

        return UserConstants.YES.equals(this.isDefault) ? true : false;

        return UserConstants.YES.equals(this.isDefault);

    }



    public String getIsDefault()


 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -59,16 +59,17 @@
        // 查询用户信息
        R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);

        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());
        }

        if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData()))
        {
            recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在");
            throw new ServiceException("登录用户：" + username + " 不存在");
        }

        if (R.FAIL == userResult.getCode())
        {
            throw new ServiceException(userResult.getMsg());
        }
        
        LoginUser userInfo = userResult.getData();
        SysUser user = userResult.getData().getSysUser();
        if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -55,16 +55,8 @@
    public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)

    {

        List<SysDept> depts = deptService.selectDeptList(new SysDept());

        Iterator<SysDept> it = depts.iterator();

        while (it.hasNext())

        {

            SysDept d = (SysDept) it.next();

            if (d.getDeptId().intValue() == deptId

                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))

            {

                it.remove();

            }

        }

        depts.removeIf(d -> d.getDeptId().intValue() == deptId

                || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));

        return AjaxResult.success(depts);

    }