From f2ab31c4c457fe4199363d2048d1eeb25b59bb56 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 11 Jul 2022 14:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../slrs/customWorkGroup/controller/WorkGroupController.java  | 2 +-
 .../mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
index d6c14c80..6f621b0e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
@@ -41,7 +41,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
 
         if (isDistinct(workGroup.getWorkGroup(),null)){
             if (iWorkGroupService.add(workGroup)){
-                return Result.success("200",null,true);
+                return Result.success("200","新增成功",true);
             }else {
                 return Result.error("201","新增失败",false);
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
index 0320519b..4f2ea859 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
@@ -28,10 +28,10 @@
             and zd.id=#{flieM.treeId}
         </if>
         <if test="flieM.dataType != null and flieM.dataType != ''">
-            AND fm.data_type = #{flieM.dataType}
+            AND fm.data_type like concat('%',#{flieM.dataType},'%')
         </if>
         <if test="flieM.dataTitle != null and flieM.dataTitle != ''">
-            AND fm.data_title = #{flieM.dataTitle}
+            AND fm.data_title like concat('%',#{flieM.dataTitle},'%')
         </if>
         <if test="flieM.startDataUploadTime != null ">
             AND fm.data_upload_time &gt;= #{flieM.startDataUploadTime}