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); }