From 1ffcdfdbf1d3932dd77f0bdaaf10c1501b78df71 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 26 Jan 2024 12:10:29 +0800 Subject: [PATCH] =?UTF-8?q?fix=2080818=20=E6=9C=AA=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A1=B9-=E5=AF=BC=E5=87=BA=20=E5=AF=BC=E5=87=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=9C=80=E6=9B=B4=E6=94=B9=20fix=2080612=20=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9-=E5=AE=9E=E9=99=85=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SysBaseApiImpl.java | 17 +++++++++++++++-- .../service/ProcessProjectNotMetService.java | 2 ++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index 59f025ac..421c0b59 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -52,6 +52,7 @@ import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.SQLException; import java.util.*; +import java.util.stream.Collectors; /** * @Description: 底层共通业务API，提供其他独立模块调用 @@ -311,7 +312,13 @@ public class SysBaseApiImpl implements ISysBaseAPI { table = QueryGenerator.getSqlRuleValue(table); } //update-end-author:taoyan date:20200820 for:【Online+系统】字典表加权限控制机制逻辑，想法不错 LOWCOD-799 - return sysDictService.queryTableDictItemsByCode(table, text, code); + List dictModels = sysDictService.queryTableDictItemsByCode(table, text, code); + dictModels.forEach(i ->{ + if (i.getText() == null){ + i.setText(StringUtils.EMPTY); + } + }); + return dictModels; } @Override @@ -1191,7 +1198,13 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public List translateDictFromTableByKeys(String table, String text, String code, String keys) { - return sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(","))); + List dictModels = sysDictService.queryTableDictTextByKeys(table, text, code, Arrays.asList(keys.split(","))); + dictModels.forEach(i ->{ + if (i.getText() == null){ + i.setText(StringUtils.EMPTY); + } + }); + return dictModels; } @Override diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java index 83b9401c..34d5dcb8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.projectnotmet.service; import cn.hutool.core.collection.CollStreamUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -293,6 +294,7 @@ public class ProcessProjectNotMetService extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); wrapper.set(LawsEvaluationNotMet::getState, UNDER_APPROVAL); + wrapper.set(LawsEvaluationNotMet::getRealityTime, DateUtil.date()); wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList); lawsEvaluationNotMetService.update(wrapper); }