From a3224b7704427066e7f738d374c3e7e51b693196 Mon Sep 17 00:00:00 2001 From: zhangqinlin <1500920753@qq.com> Date: Mon, 18 Oct 2021 17:05:31 +0800 Subject: [PATCH] =?UTF-8?q?add:=E9=82=AE=E5=AF=84=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=82=AE=E5=AF=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMailBillController.java | 3 +- .../controller/PayMailContractController.java | 7 +- .../com/jero/mail/entity/PayMailBill.java | 4 +- .../com/jero/mail/entity/PayMailBillList.java | 2 + .../com/jero/mail/entity/PayMailContract.java | 3 + .../mail/mapper/xml/PayMailBillMapper.xml | 1 + .../mail/mapper/xml/PayMailContractMapper.xml | 1 + .../AllProjectStatisticsController.java | 91 ++++++++++--------- .../CompanyComeMoneyStatisticsController.java | 58 ++++++------ .../PayWorkingGroupStatisticsController.java | 28 +++--- .../PrincipalPeopleStatisticsController.java | 44 ++++----- 11 files changed, 126 insertions(+), 116 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index ee2de975..9b1519f0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -166,7 +166,9 @@ public class PayMailBillController extends JeroController edit(@RequestBody PayMailBill payMailBill) { + LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); payMailBill.setPostStatus(1); + payMailBill.setMailer(sysUser.getUsername()); payMailBillService.updateById(payMailBill); //变更5种项目的邮寄状态 LambdaQueryWrapper queryPayMailBillProject = new LambdaQueryWrapper<>(); @@ -263,7 +265,6 @@ public class PayMailBillController extends JeroController mile(@RequestBody PayMailContract payMailContract ) { + LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId()); payMailContract.setPostStatus(1); + payMailContract.setMailer(sysUser.getUsername()); payMailContractService.updateById(payMailContract); if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) { PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId()); - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 发送消息 SendMessageDTO sendMessageDTO = new SendMessageDTO(); if (!StringUtils.isBlank(payMailContractData.getEmail())) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index efe9e977..08e809a8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -134,8 +134,8 @@ public class PayMailBill implements Serializable { @ApiModelProperty(value = "项目id") private String projectId; - - + @ApiModelProperty(value = "邮寄人") + private String mailer; @NotNull(message = "项目负责人id不能为空") @ApiModelProperty(value = "项目负责人id") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java index 94b71291..fff22149 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java @@ -51,6 +51,8 @@ public class PayMailBillList { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "邮寄时间") private java.util.Date sendDate; + @ApiModelProperty(value = "邮寄人") + private java.lang.String mailer; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java index 6c707884..112e2231 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java @@ -84,4 +84,7 @@ public class PayMailContract implements Serializable { /**联系人邮箱*/ @ApiModelProperty(value = "联系人邮箱") private String email; + /**邮寄人*/ + @ApiModelProperty(value = "邮寄人") + private String mailer; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml index 26f8c31b..93750787 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml @@ -65,6 +65,7 @@ post_status as postStatus, send_method as sendMethod , create_time, + mailer, post_no as postNo, send_date as sendDate, pmb.remark diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml index c7913f98..9d7a86ef 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml @@ -10,6 +10,7 @@ pc.post_no as postNo, pc.liaison_man as liaisonMan, pc.mobile, pc.remark, +pc.mailer, pc.send_date as sendDate, pic.contract_num as contractNum, pic.contract_name as contractName, diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 9e95cef7..5c29e89d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -84,19 +84,19 @@ public class AllProjectStatisticsController { String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { - idList=null; - //企业职员项目负责人 - }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); - }else { + } else { throw new JeroBootException("权限异常"); } @@ -161,19 +161,19 @@ public class AllProjectStatisticsController { String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { - idList=null; - //企业职员项目负责人 - }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); - }else { + } else { throw new JeroBootException("权限异常"); } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { @@ -236,21 +236,21 @@ public class AllProjectStatisticsController { String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { - String orgCode = sysUser.getOrgCode(); - List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); - idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - throw new JeroBootException("权限异常"); - } + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { + String orgCode = sysUser.getOrgCode(); + List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); + idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { + String userId = sysUser.getId(); + idList.add(userId); + } else { + throw new JeroBootException("权限异常"); + } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); String year = String.valueOf(calendar.get(Calendar.YEAR)); @@ -276,21 +276,22 @@ public class AllProjectStatisticsController { String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else { throw new JeroBootException("权限异常"); } + if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); String year = String.valueOf(calendar.get(Calendar.YEAR)); @@ -331,16 +332,16 @@ public class AllProjectStatisticsController { String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index 1b7d055b..9eecaedb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -147,21 +147,21 @@ public class CompanyComeMoneyStatisticsController { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) { - String orgCode = sysUser.getOrgCode(); - List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); - idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { - idList=null; - //企业职员项目负责人 - }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ - String userId = sysUser.getId(); - idList.add(userId); - }else { - throw new JeroBootException("权限异常"); - } + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { + String orgCode = sysUser.getOrgCode(); + List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); + idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { + String userId = sysUser.getId(); + idList.add(userId); + } else { + throw new JeroBootException("权限异常"); + } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList); HashMap hashMap = new HashMap<>(); @@ -215,16 +215,16 @@ public class CompanyComeMoneyStatisticsController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else { @@ -255,16 +255,16 @@ public class CompanyComeMoneyStatisticsController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 40df71e5..95428c89 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -159,16 +159,16 @@ public class PayWorkingGroupStatisticsController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else { @@ -202,16 +202,16 @@ public class PayWorkingGroupStatisticsController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java index 288b0198..e41f6ae2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java @@ -78,21 +78,21 @@ public class PrincipalPeopleStatisticsController { LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) { - String orgCode = sysUser.getOrgCode(); - List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); - idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) { - idList=null; - //企业职员项目负责人 - }else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){ - String userId = sysUser.getId(); - idList.add(userId); - }else { - throw new JeroBootException("权限异常"); - } + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { + String orgCode = sysUser.getOrgCode(); + List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); + idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { + String userId = sysUser.getId(); + idList.add(userId); + } else { + throw new JeroBootException("权限异常"); + } Page page = new Page<>(pageNo, pageSize); IPage pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList); @@ -197,16 +197,16 @@ public class PrincipalPeopleStatisticsController { LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String roleCode = sysUser.getRoleCode(); List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //科长 - if (roleCodes.contains(constant.BMFZR) && !(roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //所领导和admin + if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { + idList = null; + //科长 + } else if (roleCodes.contains(constant.BMFZR)) { String orgCode = sysUser.getOrgCode(); List userList = userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode)); idList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - //所领导或者超级管理员 - } else if (roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN)) { - idList = null; - //企业职员项目负责人 - } else if (roleCodes.contains(constant.XMFZR) && !(roleCodes.contains(constant.BMFZR) || roleCodes.contains(constant.SLD) || roleCodes.contains(constant.ADMIN))) { + //项目负责人 + } else if (roleCodes.contains(constant.XMFZR)) { String userId = sysUser.getId(); idList.add(userId); } else {