root/nl-sso-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-19 09:23:35 +08:00
parent 979e8d9380 2822626c4f
commit b95befb91b
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
View File

@@ -129,24 +129,25 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> impleme
.eq(Dict::getCode, dict.getCode()));
if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在");
// 判断是否有空的值
Dict selectOne = sysDictMapper.selectOne(new LambdaQueryWrapper<Dict>().eq(Dict::getCode, dict.getCode()));
if (ObjectUtil.isEmpty(selectOne.getLabel())) {
List<Dict> selectOne = sysDictMapper.selectList(new LambdaQueryWrapper<Dict>().eq(Dict::getCode, dict.getCode()));
Dict dic = selectOne.get(0);
if (ObjectUtil.isEmpty(dic.getLabel())) {
// 空就赋值
selectOne.setCode(dict.getCode());
selectOne.setLabel(dict.getLabel());
selectOne.setValue(dict.getValue());
selectOne.setDictSort(dict.getDictSort());
selectOne.setDictType(dict.getDictType());
selectOne.setPara1(dict.getPara1());
selectOne.setPara2(dict.getPara2());
selectOne.setPara3(dict.getPara3());
sysDictMapper.updateById(selectOne);
dic.setCode(dict.getCode());
dic.setLabel(dict.getLabel());
dic.setValue(dict.getValue());
dic.setDictSort(dict.getDictSort());
dic.setDictType(dict.getDictType());
dic.setPara1(dict.getPara1());
dic.setPara2(dict.getPara2());
dic.setPara3(dict.getPara3());
sysDictMapper.updateById(dic);
return;
}
// 插入新的数据
dict.setDictId(IdUtil.getSnowflake(1, 1).nextIdStr());
dict.setCode(selectOne.getCode());
dict.setName(selectOne.getName());
dict.setCode(dic.getCode());
dict.setName(dic.getName());
dict.setCreateId(SecurityUtils.getCurrentUserId());
dict.setCreateName(SecurityUtils.getCurrentNickName());
dict.setCreateTime(DateUtil.now());