From 8c477df597fa325632d84a395433088ccd871cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 10 Sep 2024 18:38:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=88=86=E5=8F=91=E5=AF=BC=E5=85=A5bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StandardInterpretFlowServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index a785ec8a..112789a7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.standardinterpret.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -960,6 +961,13 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe throw new JeroBootException("The list cannot import data！"); } } + List processStandardInterpretClauseList = + standardInterpretDTO.getProcessStandardInterpretClauseList(); + if(!CollectionUtils.isEmpty(processStandardInterpretClauseList)){ + standardInterpretDTO.setProcessStandardInterpretClauseSublistList( + JSON.parseArray(JSON.toJSONString(processStandardInterpretClauseList), + ProcessStandardInterpretClauseSublist.class)); + } List processStandardInterpretClauseSublistList = standardInterpretDTO.getProcessStandardInterpretClauseSublistList(); if (list.size() != processStandardInterpretClauseSublistList.size()){ @@ -1403,12 +1411,15 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe if (i > 0 && exist){ // 条款校验 ProcessStandardInterpretClauseSublist processStandardInterpretClauseSublist = clauseSublistList.get(i); - if(processStandardInterpretClauseSublist.getItemNum().equals(itemNum) - && processStandardInterpretClauseSublist.getItemTitle().equals(itemTitle)){ + if(Objects.equals(processStandardInterpretClauseSublist.getItemNum(), itemNum) + && Objects.equals(StringUtils.isBlank(processStandardInterpretClauseSublist.getItemTitle()) ? + "":processStandardInterpretClauseSublist.getItemTitle(), + (StringUtils.isBlank(itemTitle) ? "":itemTitle))){ data.setClauseId(processStandardInterpretClauseSublist.getClauseId()); data.setItemTitle(processStandardInterpretClauseSublist.getItemTitle()); data.setItemContent(processStandardInterpretClauseSublist.getItemContent()); data.setTranslation(processStandardInterpretClauseSublist.getTranslation()); + data.setTitleTranslation(processStandardInterpretClauseSublist.getTitleTranslation()); }else { errorList.add("该数据在业务分派信息中不存在！"); }