From e0f4eb3d0fd176ec27cbfbb8a8aef27806d247b7 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Dec 2021 17:42:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=80=BB=E6=95=B0=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 6d089807..7c8e4c57 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -901,9 +901,6 @@
             <!-- 标准名称 -->
             <if test="standName != null and standName != ''">
                 and stand_name like concat(concat('%',#{standName}),'%')
-                or STAND_NUMBER like concat(concat('%',#{standName}),'%')
-                or STAND_YEAR like concat(concat('%',#{standName}),'%')
-                or STAND_SORT like concat(concat('%',#{standName}),'%')
             </if>
             <if test="standEnName != null and standEnName != ''">
                 and stand_en_name like concat(concat('%',#{standEnName}),'%')

From 71354b944f2c543ecf2bd9926ba1407685dac251 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Dec 2021 17:43:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87id=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FileMaterialController.java           |  2 +-
 .../fileMaterialCenter/entity/FileMaterialPage.java  |  2 ++
 .../service/impl/FileMaterialServiceImpl.java        | 12 +++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
index 555d4d4d..8fa350fa 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
@@ -78,7 +78,7 @@ public class FileMaterialController extends BaseController<FileMaterial> {
 
     @PutMapping
     @ApiOperation("修改文件资料组")
-    public ResponseMessage updateFileMaterial(FileMaterial fileMaterial){
+    public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){
         boolean b = iFileMaterialService.updateById(fileMaterial);
 
         return Result.success(b);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java
index f99ac329..78a7b927 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java
@@ -8,6 +8,8 @@ import lombok.Data;
 @Data
 public class FileMaterialPage {
 
+    private String id;
+
     private String dataTitle;
 
     private String dataType;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
index 5692f135..b333c70c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
@@ -52,7 +52,17 @@ public class FileMaterialServiceImpl extends ServiceImpl<FileMaterialDao, FileMa
                     queryPage.getEndDataUploadTime());
         }
 
-        return this.page(new Page<>(queryPage.getPage(),queryPage.getPageSize()),queryWrapper);
+        if (queryPage.getId()!=null && !"".equals(queryPage.getId()) ){
+            queryWrapper.eq("id",queryPage.getId());
+        }
+        IPage<FileMaterial> page=null;
+        if (queryPage.getPage()==null || queryPage .getPageSize()==null){
+            page=new Page<>(1,1);
+        }else {
+            page=new Page<>(queryPage.getPage(),queryPage.getPageSize());
+        }
+
+        return this.page(page,queryWrapper);
     }
 
     @Override

From 3bf802fd75d29eed844a8dfc81e6d010567fe716 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 16 Dec 2021 20:47:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandardsInfo/controller/SarStandardsInfoController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
index 17b851a6..0182065a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
@@ -303,7 +303,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         if (result > 0) {
             return Result.success("0", "删除成功", result);
         }else if(result == -1) {
-            return Result.success("-1","所选的标准下挂有标准，无法删除");
+            return Result.success("-1","所选的标准下挂有清单，无法删除");
         }
         else {
             return Result.error("删除失败");