From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 28 May 2021 17:36:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 07a42ce..a0aa05b 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
@@ -52,7 +52,7 @@
SysDictTypeDTO dto = new SysDictTypeDTO();
//������Id
Integer typeId = form.getId();
- //������type������������
+ //������������������type������������������
QueryWrapper<SysDictType> existWrapper = new QueryWrapper<>();
existWrapper.eq("is_delete",Constants.NOT_DELETE);
existWrapper.eq("id",typeId);
@@ -75,7 +75,6 @@
//������������������
CacheUtils.clearDictionariesCache();
//������������������
- dto.setSysDictType(type);
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
@@ -89,7 +88,7 @@
SysDictTypeDTO dto = new SysDictTypeDTO();
//������������
SysDictType type = form.formConvertEntity();
- //������type������������
+ //������type������������������
QueryWrapper<SysDictType> existNameWrapper = new QueryWrapper<>();
existNameWrapper.eq("id",type.getId());
existNameWrapper.eq("is_delete",Constants.NOT_DELETE);
@@ -106,7 +105,6 @@
//������������
CacheUtils.clearDictionariesCache();
//������������������
- dto.setSysDictType(sysDictType);
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
--
Gitblit v1.8.0