From 68b30653a40789db04df9ff6b81717bd9e89e1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Mon, 22 Apr 2024 22:59:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SurProjectAuditinfoServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java index 62399205..326355c9 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java @@ -174,11 +174,14 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi } SmzSspProblemmodifyWhere smzSspProblemmodifyWhere = new SmzSspProblemmodifyWhere(); - smzSspProblemmodifyWhere.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey())); + if(StringUtils.isNotEmpty(flowTaskEntity.getBusinessKey())){ + smzSspProblemmodifyWhere.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey())); + } smzSspProblemmodifyWhere.setInfoType(1L); Long minRole = flowTaskEntity.getRoleIds().stream().mapToLong(Long::longValue).min().getAsLong(); smzSspProblemmodifyWhere.setNowRole(Convert.toStr(minRole)); smzSspProblemmodifyWhere.setNowUser(flowTaskEntity.getNowUserName()); + smzSspProblemmodifyWhere.setNowDept(flowTaskEntity.getNowDept()); int zlCount = 0; List> zlDataList = smzSspProblemmodifyMapper.findProblemmodifyGroupByCheckState(smzSspProblemmodifyWhere); if(StringUtils.isNotEmpty(zlDataList)){ @@ -208,6 +211,9 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi dataMap.put("approveCLFY",d); //查询劳资预警审批信息 FlowLabourInfo flowLabourInfo=new FlowLabourInfo(); + if(StringUtils.isNotEmpty(flowTaskEntity.getBusinessKey())){ + flowLabourInfo.setProjectId(Convert.toLong(flowTaskEntity.getBusinessKey())); + } flowLabourInfo.setNowRole(flowTaskEntity.getNowRole()); flowLabourInfo.setNowDept(flowTaskEntity.getNowDept()); flowLabourInfo.setNowUser(flowTaskEntity.getNowUser());