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 { 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} - AND fm.data_type = #{flieM.dataType} + AND fm.data_type like concat('%',#{flieM.dataType},'%') - AND fm.data_title = #{flieM.dataTitle} + AND fm.data_title like concat('%',#{flieM.dataTitle},'%') AND fm.data_upload_time >= #{flieM.startDataUploadTime}