Commit cbe80241 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;
9.开发当日已优化间开结果列表查询接口,生成对应接口文档并完成接口冒烟测试;
10.基础间开新增/修改/详情功能修改,增加防冻土策略逻辑,修改对应接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 39ddb9a3
......@@ -813,10 +813,10 @@ public class SysOrganizationService {
PageHelper.startPage(input.getPage(), input.getLimit());
record.setIsDeleted(SysOrganizationCode.NORMAL);
List<SysOrganizationView> list = mapper.selectSysOrganizationList(record);
if (CollectionUtils.isEmpty(list) && StringUtils.isNotBlank(record.getId())) {
if (CollUtil.isEmpty(list) && StringUtils.isNotBlank(record.getId())) {
SysOrganizationView owner = mapper.selectOne(record);
List<SysOrganizationView> parentList = mapper.selectOrganizationBySubOuIds(Arrays.asList(record.getId()));
if (!CollectionUtils.isEmpty(parentList)) {
if (CollUtil.isNotEmpty(parentList)) {
SysOrganizationView parent = parentList.get(0);
owner.setParentOuId(parent.getParentOuId());
owner.setPartentName(parent.getPartentName());
......@@ -828,7 +828,7 @@ public class SysOrganizationService {
unitLevelInput.setAlias("UNIT_LEVEL");
XListResult<QuerySysDictionaryViewOutput> unitLevel = dictService.querySysDictionarysByAlias(context, unitLevelInput);
unitLevel.throwIfFail();
if (!CollectionUtils.isEmpty(list)) {
if (CollUtil.isNotEmpty(list)) {
List<String> parentIds = list.stream()
.map(SysOrganizationView::getId)
.collect(Collectors.toList());
......@@ -845,7 +845,7 @@ public class SysOrganizationService {
view.setIsHasChildren(0);
}
//单位级别
if (!CollectionUtils.isEmpty(unitLevel.getResult())) {
if (CollUtil.isNotEmpty(unitLevel.getResult())) {
view.setLevelDicName(unitLevel.getResult().stream()
.filter(row -> StringUtils.equals(row.getDicKey(), view.getOuLevel()))
.map(QuerySysDictionaryViewOutput::getDicName)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment