Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 f6839337d85392dde294caf959e3f171230ba08b

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java

@@ -365,6 +365,7 @@
    @ApiOperation(value = "获取距离最近的任务列表")
    @PostMapping(value = "/listAllTask")
    public R<List<TaskListAllVO>> listAllTask(@RequestBody AppealListDTO appealListDTO) {
        appealListDTO.setUserId(tokenService.getLoginUserApplet().getUserId() + "");
        List<TaskListAllVO> res = appealService.listAllTask(appealListDTO);
        return R.ok(res);
    }
@@ -492,7 +493,7 @@
            for (SysUser sysUser : collect) {
                Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
                SysRole sysRole1 = roleService.selectRoleById(userRole1);
                if (sysRole1 != null && sysRole1.getRoleName().equals("部门负责人")) {
                if (sysRole1 != null && sysRole1.getRoleName().contains("部门负责人")) {
                    LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                    tLeaveAudit.setAvatar(sysUser.getAvatar());
                    tLeaveAudit.setNickName(sysUser.getNickName());
@@ -580,7 +581,7 @@
            for (SysUser sysUser : collect) {
                Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
                SysRole sysRole1 = roleService.selectRoleById(userRole1);
                if (sysRole1 != null && sysRole1.getRoleName().equals("部门负责人")) {
                if (sysRole1 != null && sysRole1.getRoleName().contains("部门负责人")) {
                    TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                    tLeaveAudit1.setLeaveId(leaveDTO.getId());
                    tLeaveAudit1.setAuditStatus(1);