|
@@ -481,7 +481,7 @@ public class CwjsPolicyInfoController {
|
|
List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
|
|
List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
|
|
|
|
|
|
//查询政策审核人员
|
|
//查询政策审核人员
|
|
- List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
|
|
|
|
+// List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
|
|
cwjsPolicyInfos.forEach(cwjsPolicy -> {
|
|
cwjsPolicyInfos.forEach(cwjsPolicy -> {
|
|
CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(), 1); // 查询 被拒 审核意见 最新的一条
|
|
CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(), 1); // 查询 被拒 审核意见 最新的一条
|
|
cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
|
|
cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
|
|
@@ -536,7 +536,7 @@ public class CwjsPolicyInfoController {
|
|
cwjsPolicy.setTheBossRight("no");
|
|
cwjsPolicy.setTheBossRight("no");
|
|
//政策审核人员 && 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
//政策审核人员 && 状态不为3 审核通过 && 状态不为4 审核拒绝 则显示 转领导审批
|
|
if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
|
|
if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
|
|
- && !Check.isNull(users) && users.toString().contains(cwjsPolicy.getApprovedProgress())) {
|
|
|
|
|
|
+ && "policyReview".equals(roleCode)) {
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
cwjsPolicy.setTheBossRight("yes");
|
|
}
|
|
}
|
|
/*
|
|
/*
|