From 71691291681435d23f9e0e4cb20d4db812744824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 10 Oct 2024 16:11:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B3=E9=94=AE=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=9E=8B=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=A1=AE=E8=AE=A4=E7=94=9F=E6=88=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessPartTypeApplyRecordServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java index cfdab27c..4e8c1822 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyRecordServiceImpl.java @@ -129,16 +129,16 @@ public class ProcessPartTypeApplyRecordServiceImpl extends ServiceImpl queryProcessPartTypeApplyRecord = new QueryWrapper<>(); queryProcessPartTypeApplyRecord.select("max(part_relevance_type) as part_relevance_type"); - queryProcessPartTypeApplyRecord.likeLeft("part_relevance_type",lawsPartRelevance.getSystemCode()); queryProcessPartTypeApplyRecord.ne("id",obj.getId()); + queryProcessPartTypeApplyRecord.last(" and part_relevance_type REGEXP '^" + lawsPartRelevance.getSystemCode() + "[A-Z]{3}$';"); ProcessPartTypeApplyRecord max = getOne(queryProcessPartTypeApplyRecord,false); - if(Objects.isNull(max)){ + if(Objects.isNull(max) || StringUtils.isEmpty(max.getPartRelevanceType())){ partRelevanceType = lawsPartRelevance.getSystemCode() + "AAA"; }else{ - String str = max.getPartRelevanceType().replace(lawsPartRelevance.getSystemCode(),""); - if(StringUtils.isEmpty(str)){ + if(max.getPartRelevanceType().length() < 3){ partRelevanceType = lawsPartRelevance.getSystemCode() + "AAA"; }else{ + String str = max.getPartRelevanceType().substring(max.getPartRelevanceType().length() - 3); partRelevanceType = lawsPartRelevance.getSystemCode() + generateNext(str); }