Merge remote-tracking branch 'origin/master'

xuhy

21 小时以前 1dfb91db022f6cfa4bcb9d953ca9aa8a503e1ca5

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

@@ -562,16 +562,37 @@
                for (SysUser sysUser : collect) {
                    Long userRole1 = sysUserService.getUserRole(sysUser.getUserId());
                    SysRole sysRole1 = roleService.selectRoleById(userRole1);

//                    if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
//                        if (userDept.getId().equals(sysUser.getDeptId())){
//                            LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
//                            tLeaveAudit.setAvatar(sysUser.getAvatar());
//                            tLeaveAudit.setNickName(sysUser.getNickName());
//                            res.setAuditPerson(tLeaveAudit);
//                            res.setAuditPersonId(sysUser.getUserId() + "");
//                            break;
//                        }
//                    }
                    if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
                        if (userDept.getParentId().equals(sysUser.getDeptId())){
                            LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                            tLeaveAudit.setAvatar(sysUser.getAvatar());
                            tLeaveAudit.setNickName(sysUser.getNickName());
                            res.setAuditPerson(tLeaveAudit);
                            res.setAuditPersonId(sysUser.getUserId() + "");
                            break;
                        if (!sysRole.getRoleName().contains("项目部助理")){
                            if (userDept.getParentId().equals(sysUser.getDeptId())){
                                LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                                tLeaveAudit.setAvatar(sysUser.getAvatar());
                                tLeaveAudit.setNickName(sysUser.getNickName());
                                res.setAuditPerson(tLeaveAudit);
                                res.setAuditPersonId(sysUser.getUserId() + "");
                                break;
                            }
                        }else{
                            if (userDept.getId().equals(sysUser.getDeptId())){
                                LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                                tLeaveAudit.setAvatar(sysUser.getAvatar());
                                tLeaveAudit.setNickName(sysUser.getNickName());
                                res.setAuditPerson(tLeaveAudit);
                                res.setAuditPersonId(sysUser.getUserId() + "");
                                break;
                            }
                        }

                    }
                }
            }
@@ -645,6 +666,13 @@
            tLeaveAudit1.setAuditId(auditPerson.getUserId() + "");
            tLeaveAudit1.setAuditType(1);
            leaveAuditService.save(tLeaveAudit1);
            TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
            tLeaveAudit2.setLeaveId(leaveDTO.getId());
            tLeaveAudit2.setAuditStatus(2);
            tLeaveAudit2.setAuditId(user.getUserId() + "," + auditPerson.getUserId());
            tLeaveAudit2.setAuditType(2);
            tLeaveAudit2.setAuditTime(LocalDateTime.now());
            leaveAuditService.save(tLeaveAudit2);
        } else if (!sysRole.getRoleName().equals("部门助理")) {
            // 审批人根据当前角色类型来
            if (sysRole.getRoleName().contains("片区负责人") || sysRole.getRoleName().contains("组长")|| sysRole.getRoleName().contains("队长")
@@ -657,25 +685,48 @@
                    SysRole sysRole1 = roleService.selectRoleById(userRole1);

                    if (sysRole1 != null && sysRole1.getRoleName().equals("项目部负责人")) {
                        if (userDept.getParentId().equals(sysUser.getDeptId())){
                            LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                            tLeaveAudit.setAvatar(sysUser.getAvatar());
                            tLeaveAudit.setNickName(sysUser.getNickName());
                            TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                            tLeaveAudit1.setLeaveId(leaveDTO.getId());
                            tLeaveAudit1.setAuditStatus(1);
                            tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                            tLeaveAudit1.setAuditType(1);
                            leaveAuditService.save(tLeaveAudit1);
                            TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
                            tLeaveAudit2.setLeaveId(leaveDTO.getId());
                            tLeaveAudit2.setAuditStatus(2);
                            tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
                            tLeaveAudit2.setAuditType(2);
                            tLeaveAudit2.setAuditTime(LocalDateTime.now());
                            leaveAuditService.save(tLeaveAudit2);
                            break;
                        }
                       if (!sysRole.getRoleName().contains("项目部助理")){
                           if (userDept.getParentId().equals(sysUser.getDeptId())){
                               LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                               tLeaveAudit.setAvatar(sysUser.getAvatar());
                               tLeaveAudit.setNickName(sysUser.getNickName());
                               TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                               tLeaveAudit1.setLeaveId(leaveDTO.getId());
                               tLeaveAudit1.setAuditStatus(1);
                               tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                               tLeaveAudit1.setAuditType(1);
                               leaveAuditService.save(tLeaveAudit1);
                               TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
                               tLeaveAudit2.setLeaveId(leaveDTO.getId());
                               tLeaveAudit2.setAuditStatus(2);
                               tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
                               tLeaveAudit2.setAuditType(2);
                               tLeaveAudit2.setAuditTime(LocalDateTime.now());
                               leaveAuditService.save(tLeaveAudit2);
                               break;
                           }
                       }else{
                           if (userDept.getId().equals(sysUser.getDeptId())){
                               LeaveAuditVO tLeaveAudit = new LeaveAuditVO();
                               tLeaveAudit.setAvatar(sysUser.getAvatar());
                               tLeaveAudit.setNickName(sysUser.getNickName());
                               TLeaveAudit tLeaveAudit1 = new TLeaveAudit();
                               tLeaveAudit1.setLeaveId(leaveDTO.getId());
                               tLeaveAudit1.setAuditStatus(1);
                               tLeaveAudit1.setAuditId(sysUser.getUserId() + "");
                               tLeaveAudit1.setAuditType(1);
                               leaveAuditService.save(tLeaveAudit1);
                               TLeaveAudit tLeaveAudit2 = new TLeaveAudit();
                               tLeaveAudit2.setLeaveId(leaveDTO.getId());
                               tLeaveAudit2.setAuditStatus(2);
                               tLeaveAudit2.setAuditId(user.getUserId() + "," + sysUser.getUserId());
                               tLeaveAudit2.setAuditType(2);
                               tLeaveAudit2.setAuditTime(LocalDateTime.now());
                               leaveAuditService.save(tLeaveAudit2);
                               break;
                           }
                       }

                    }
                }
            }