From 37d9730b8a2c728f6eb29c6772457a666edb231c Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 23 Oct 2023 15:39:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DocumentSplitController.java         |  4 +++-
 .../laws/documenttool/entity/DocumentSplitInfo.java |  6 ++++++
 .../documenttool/mapper/xml/DocumentSplitMapper.xml | 13 +++++++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
index 23496431..af4280ed 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
@@ -3,6 +3,8 @@ package com.jero.modules.laws.documenttool.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.util.MessageUtils;
+import com.jero.modules.laws.common.constant.ResultCommon;
 import com.jero.modules.laws.documenttool.common.DocumentSplitCommon;
 import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo;
 import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView;
@@ -82,7 +84,7 @@ public class DocumentSplitController {
     @PostMapping(value = "/updatePermissions")
     public Result<T> updatePermissions(@Validated @RequestBody DocumentSplitInfo documentSplitInfo) {
         documentSplitService.updatePermissions(documentSplitInfo);
-        return Result.OK("操作成功!");
+        return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
     }
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java
index d8fa6b65..e3f4d53d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/DocumentSplitInfo.java
@@ -92,4 +92,10 @@ public class DocumentSplitInfo extends BaseEntity {
     @ApiModelProperty(value = "标准编号/标准名称 搜索用")
     @TableField(exist = false)
     private String serialNumberOrName;
+
+    /**标准标识（1：国内，3：企业）*/
+    @ApiModelProperty(value = "标准标识（1：国内，3：企业）")
+    @TableField(exist = false)
+    @Dict(dicCode = "split_standard_source")
+    private String splitStandardSource;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index 7e1b62ff..58c76374 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -97,9 +97,18 @@
 
     <select id="queryByPage" resultType="com.jero.modules.laws.documenttool.entity.DocumentSplitInfo">
         select *
-        from (select i.id as id,
+        from (select i.id as                                     id,
                      serial_number,
-                     (IF(length(s.standard_name) > 0, s.standard_name, d.standard_name)) title,
+                     (CASE
+                          WHEN length(s.standard_name) > 0 THEN s.standard_name
+                          WHEN length(d.standard_name) > 0 THEN d.standard_name
+                          ELSE title
+                         END)                                    title,
+                     (CASE
+                          WHEN length(s.id) > 0 THEN 1
+                          WHEN length(d.id) > 0 THEN 3
+                          ELSE ''
+                         END)                                    splitStandardSource,
                      file_type,
                      file_name,
                      split_status,