From 496504104d77af999e740e93f7cde1b0e0a478fe Mon Sep 17 00:00:00 2001
From: hp <2969694837@qq.com>
Date: Thu, 29 Sep 2022 16:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=A0=E5=B0=84=E6=8E=A5=E5=8F=A3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/anrui/portal/api/dicttype/DictTypeVo.java  |  3 +++
 .../portal/biz/sysmapping/SysMappingService.java   | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java
index 77cd275683..da50398d03 100644
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/dicttype/DictTypeVo.java
@@ -25,5 +25,8 @@ public class DictTypeVo implements Vo {
     @ApiModelProperty(value = "说明")
     private String remarks;
 
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+
 
 }
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
index 57398f04a7..1475ffac0a 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmapping/SysMappingService.java
@@ -69,7 +69,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     public QueryWrapper<SysMappingVo> queryWrapper(SysMappingQuery query) {
         QueryWrapper<SysMappingVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getMap_sourceKey())) {
-            qw.eq("sm.map_sourceKey", query.getMap_sourceKey());
+            qw.like("sm.map_sourceKey", query.getMap_sourceKey());
         }
         if (StringUtils.isNotBlank(query.getMap_sourceValue())) {
             qw.like("sm.map_sourceValue", query.getMap_sourceValue());
@@ -81,22 +81,22 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
             qw.like("sm.map_item", query.getMap_item());
         }
         if (StringUtils.isNotBlank(query.getMap_itemKey())) {
-            qw.eq("sm.map_itemKey", query.getMap_itemKey());
+            qw.like("sm.map_itemKey", query.getMap_itemKey());
         }
         if (StringUtils.isNotBlank(query.getMap_itemValue())) {
             qw.like("sm.map_itemValue", query.getMap_itemValue());
         }
         if (StringUtils.isNotBlank(query.getDictTypeCode())) {
-            qw.eq("dc.dictKey", query.getDictTypeCode());
+            qw.like("dt.dictTypeCode", query.getDictTypeCode());
         }
         if (StringUtils.isNotBlank(query.getDictTypeName())) {
-            qw.like("dc.dictValue", query.getDictTypeName());
+            qw.like("dt.dictTypeName", query.getDictTypeName());
         }
         if (StringUtils.isNotBlank(query.getDictKey())) {
-            qw.eq("dt.dictTypeCode", query.getDictKey());
+            qw.like("dc.dictKey", query.getDictKey());
         }
         if (StringUtils.isNotBlank(query.getDictValue())) {
-            qw.like("dt.dictTypeName", query.getDictValue());
+            qw.like("dc.dictValue", query.getDictValue());
         }
         return qw;
     }
@@ -137,7 +137,7 @@ public class SysMappingService extends MybatisBaseService<SysMappingMapper, SysM
     public void saveMappingList(List<SysMappingDto> dto) {
         for (SysMappingDto sysMappingDto : dto) {
             SysMapping entity = new SysMapping();
-            BeanUtil.copyProperties(sysMappingDto, entity, "sid");
+            BeanUtil.copyProperties(sysMappingDto, entity);
             entity.setCreateBySid(sysMappingDto.getUserSid());
             save(entity);
         }