From ea761dd22bf7812f46621c9a5bd291c3d74a777f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 19 Apr 2024 14:54:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=91=E5=AE=9A=E9=9B=B6=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsBindPartController.java     |  4 ++--
 .../laws/bindPart/entity/LawsBindPart.java     | 12 ++++++++++++
 .../bindPart/mapper/xml/LawsBindPartMapper.xml | 18 ++++++++++++------
 .../service/impl/LawsBindPartServiceImpl.java  |  6 ++----
 .../controller/DocumentSplitController.java    |  2 +-
 .../service/IDocumentSplitService.java         |  2 +-
 .../service/impl/DocumentSplitServiceImpl.java |  6 ++++--
 7 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java
index 6d403bb7..5899d199 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/controller/LawsBindPartController.java
@@ -150,7 +150,7 @@ public class LawsBindPartController {
     @PostMapping(value = "/selectClause")
     public Result<IPage<Map<String, Object>>> selectClause(@RequestBody Map<String, Object> parameter) {
         try {
-            IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter);
+            IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter, false);
             return Result.OK(data);
         } catch (JeroBootException e){
             return Result.error(e.getMessage());
@@ -166,7 +166,7 @@ public class LawsBindPartController {
      */
     @AutoLog(value = "绑定零部件-条款目录树")
     @ApiOperation(value="绑定零部件-条款目录树", notes="绑定零部件-条款目录树")
-    @GetMapping(value = "/selectClause")
+    @GetMapping(value = "/clauseTree")
     public Result<List<SarFileSplitMenuEO>> clauseTree(SarFileSplitMenuEOPage page) {
         page.setValidFlag("0");
         page.setOrderBy("display_seq asc");
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java
index b201465d..a890cb39 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/entity/LawsBindPart.java
@@ -57,6 +57,18 @@ public class LawsBindPart implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private String orgCode;
 
+    /**
+     * 标准Id
+     */
+    @ApiModelProperty(value = "标准Id")
+    private String standardId;
+
+    /**
+     * 标准类型
+     */
+    @ApiModelProperty(value = "标准类型")
+    private String standardType;
+
     /**
      * 零部件号
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml
index b5986ff1..60be2b5f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/mapper/xml/LawsBindPartMapper.xml
@@ -11,6 +11,8 @@
             <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="orgCode" column="org_code" jdbcType="VARCHAR"/>
+            <result property="standardId" column="standard_id" jdbcType="VARCHAR"/>
+            <result property="standardType" column="standard_type" jdbcType="VARCHAR"/>
             <result property="partNo" column="part_no" jdbcType="VARCHAR"/>
             <result property="partName" column="part_name" jdbcType="VARCHAR"/>
             <result property="docSplitId" column="doc_split_id" jdbcType="VARCHAR"/>
@@ -31,24 +33,26 @@
             bp.part_no,
             bp.part_name,
             bp.doc_split_id,
-            standard.standard_number,
+            bp.standard_id,
+            standard.standard_number AS standardNo,
             standard.standard_name,
-            GROUP_CONCAT(lbpd.clause_id ORDER BY split.item_num SEPARATOR ', ') AS clauseIds,
-            GROUP_CONCAT(split.item_num ORDER BY split.item_num SEPARATOR ', ') AS clauseNos,
+            GROUP_CONCAT(lbpd.clause_id ORDER BY split.item_num SEPARATOR ',') AS clauseIds,
+            GROUP_CONCAT(split.item_num ORDER BY split.item_num SEPARATOR ',') AS clauseNos,
             bp.bind_user,
             bp.bind_time
         FROM
         `laws_bind_part` AS bp
-        LEFT JOIN sar_file_split_info AS sfsi ON bp.doc_split_id = sfsi.id
         LEFT JOIN (
             select id, standard_number, standard_name from laws_enterprise_standard where del_flag = 0
             UNION ALL
             select id, standard_number, standard_name from laws_domestic_standard where del_flag = 0
             UNION ALL
             select id, standard_number, standard_name from laws_overseas_standard where del_flag = 0
-        ) AS standard ON sfsi.standard_id = standard.id
+        ) AS standard ON bp.standard_id = standard.id
+        LEFT JOIN sar_file_split_info AS sfsi ON bp.doc_split_id = sfsi.id
         LEFT JOIN laws_bind_part_doc AS lbpd ON lbpd.bind_id = bp.id
         LEFT JOIN laws_document_split AS split ON split.id = lbpd.clause_id
+        LEFT JOIN sys_user AS u ON u.id = bp.bind_user
         <where>
             <!--零部件号-->
             <if test="param.partNo != null and param.partNo != ''">
@@ -68,9 +72,11 @@
             </if>
             <!--绑定人员-->
             <if test="param.bindUser != null and param.bindUser != ''">
-                AND bp.bind_user = #{param.bindUser}
+                AND CONCAT(u.realname, '(', u.username, ')')  LIKE CONCAT('%',#{param.bindUser},'%')
             </if>
         </where>
+        GROUP BY
+            bp.id
     </select>
 
     <select id="selectStandard" resultType="com.jero.modules.laws.bindPart.entity.BindPartStandardVO">
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/service/impl/LawsBindPartServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/service/impl/LawsBindPartServiceImpl.java
index 7a8e1b51..d1b17a13 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/bindPart/service/impl/LawsBindPartServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/bindPart/service/impl/LawsBindPartServiceImpl.java
@@ -19,10 +19,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.jero.common.constant.CommonConstant.HAS_SEND;
@@ -54,6 +51,7 @@ public class LawsBindPartServiceImpl extends ServiceImpl<LawsBindPartMapper, Law
 
     @Override
     public void add(LawsBindPart lawsBindPart) {
+        lawsBindPart.setBindTime(new Date());
         save(lawsBindPart);
         String clauseIds = lawsBindPart.getClauseIds();
         this.saveBindPartDoc(clauseIds, lawsBindPart.getId());
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 bc27c5e2..c41d1bbc 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
@@ -251,7 +251,7 @@ public class DocumentSplitController {
     @ApiOperationSupport(order = 11)
     public Result<IPage<Map<String,Object>>> queryDocumentSplitDetail(@RequestBody @ApiParam("标签管理") Map<String, Object> parameter) {
         try {
-            IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter);
+            IPage<Map<String, Object>> data = documentSplitService.queryDocumentSplitDetail(parameter, true);
             return Result.OK(data);
         } catch (JeroBootException e){
             return Result.error(e.getMessage());
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
index 28d17a96..e3466031 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java
@@ -56,7 +56,7 @@ public interface IDocumentSplitService {
      * @param parameter
      * @return
      */
-    IPage<Map<String, Object>> queryDocumentSplitDetail(Map<String, Object> parameter);
+    IPage<Map<String, Object>> queryDocumentSplitDetail(Map<String, Object> parameter, boolean horizonValid);
 
     /**
      * 文档拆分详情-列表查询
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 1d1c2581..ed4e2b4d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -257,8 +257,10 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     }
 
     @Override
-    public IPage<Map<String, Object>> queryDocumentSplitDetail(Map<String, Object> parameter) {
-        isHorizontalOverstep(parameter.get(INFO_ID).toString());
+    public IPage<Map<String, Object>> queryDocumentSplitDetail(Map<String, Object> parameter, boolean horizonValid) {
+        if (horizonValid) {
+            isHorizontalOverstep(parameter.get(INFO_ID).toString());
+        }
         // 查询全部字段列表
         List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.DOCUMENT_SPLIT.getTableName());
         // 列表展示字段