From 4ef0493f8326e9beea930189b19e4549a9dc0902 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 5 Feb 2024 15:51:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081771=20=E5=B7=B2=E5=8A=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E6=90=9C=E7=B4=A2=E6=B5=81=E7=A8=8B=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=88=E5=B7=B2=E6=92=A4=E5=9B=9E=E7=9A=84=EF=BC=89?= =?UTF-8?q?--=E6=8A=A5=E6=93=8D=E4=BD=9C=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/controller/WorkCenterController.java | 4 ++-- .../modules/activiti/service/ProcessAllService.java | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index d41e93f4..ea4ec8b3 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -174,8 +174,8 @@ public class WorkCenterController { Integer prcType = processAll.getPrcType(); Integer prcStatus = processAll.getPrcStatus(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(StringUtils.isNotBlank(prcName), "pa.prc_name", "%" + prcName + "%"); - queryWrapper.like(StringUtils.isNotBlank(prcNum), "pa.prc_num", "%" + prcNum + "%"); + queryWrapper.like(StringUtils.isNotBlank(prcName), "pa.prc_name", prcName); + queryWrapper.like(StringUtils.isNotBlank(prcNum), "pa.prc_num", prcNum); queryWrapper.eq(prcType != null, "pa.prc_type", prcType); queryWrapper.eq(prcStatus != null, "pa.prc_status", prcStatus); queryWrapper.groupBy(groupBy, "pa.id"); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 7444784e..1db57797 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -103,6 +103,9 @@ public class ProcessAllService extends ServiceImpl String order = req.getParameter("order"); IPage completedList = processAllMapper.getCompletedList(page, queryWrapper, column, order); List records = completedList.getRecords(); + if (records.isEmpty()){ + return completedList; + } List collect = records.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("process_instance_id","group_concat(distinct user_id) as user_id"); @@ -123,6 +126,9 @@ public class ProcessAllService extends ServiceImpl String order = req.getParameter("order"); IPage sentList = processAllMapper.getSentList(page, queryWrapper, column, order); List records = sentList.getRecords(); + if (records.isEmpty()){ + return sentList; + } List collect = records.stream().map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("process_instance_id","group_concat(distinct user_id) as user_id"); @@ -142,7 +148,9 @@ public class ProcessAllService extends ServiceImpl String order = req.getParameter("order"); IPage allList = processAllMapper.getAllList(page, queryWrapper, column, order); List records = allList.getRecords(); - + if (records.isEmpty()){ + return allList; + } List incompleteCollect = records.stream().filter(item -> ProcessStatusEnum.INCOMPLETE.getValue().equals(item.getPrcStatus())).map(ProcessAll::getProcessInstanceId).collect(Collectors.toList()); List incompleteRecordList = new ArrayList<>(); if (!incompleteCollect.isEmpty()) {