From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
index 74d35c9..b9bd60d 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -48,8 +48,6 @@
SysDictDataService sysDictDataService;
@Autowired
RedisTemplate redisTemplate;
- @Autowired
- LogUtils logUtils;
@Override
@Transactional
@@ -80,7 +78,7 @@
sysDictDataService.update(null,deleteDataWrapper);
//������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- logUtils.saveOperationForManage(request,"������������������:"+type.getName(),Constants.DELETE_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,"������������������:"+type.getName(),Constants.DELETE_OPERATE_TYPE);
//������������������
refreshCache();
//������������������
@@ -126,10 +124,7 @@
//������������������������
SysDictType sysDictType = form.formConvertEntity();
//������name������������������
- QueryWrapper<SysDictType> existNameWrapper = new QueryWrapper<>();
- existNameWrapper.eq("name",sysDictType.getName());
- existNameWrapper.eq("is_delete",Constants.NOT_DELETE);
- SysDictType existType = sysDictTypeMapper.selectOne(existNameWrapper);
+ SysDictType existType = sysDictTypeMapper.listOne(sysDictType.getName());
if(!ObjectUtils.isEmpty(existType)){
dto.setCode(ResponseCodeEnum.DICTTYPE_EXIST.getCode());
dto.setMsg(ResponseCodeEnum.DICTTYPE_EXIST.getMsg());
@@ -139,7 +134,7 @@
sysDictTypeMapper.insert(sysDictType);
//������������
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- logUtils.saveOperationForManage(request,"������������������:"+sysDictType.getName(),Constants.INSERT_OPERATE_TYPE);
+ LogUtils.saveOperationForManage(request,"������������������:"+sysDictType.getName(),Constants.INSERT_OPERATE_TYPE);
//������������
refreshCache();
//������������������
@@ -207,6 +202,7 @@
private List<SysDictType> getAllDictTypeFromDB() {
QueryWrapper<SysDictType> wrapper = new QueryWrapper<>();
wrapper.eq("is_delete", Constants.NOT_DELETE);
+ wrapper.orderByAsc("id");
List<SysDictType> sysDictTypes = sysDictTypeMapper.selectList(wrapper);
return sysDictTypes;
}
--
Gitblit v1.8.0