From f0f529525a8e8b632f664716d29bffee14db5728 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 3 Nov 2023 16:28:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8):=20=E5=AD=97=E6=AE=B5=E5=B1=9E=E6=80=A7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SarFileCompareInfoController.java  |  2 --
 .../entity/LawsStandardizationGroup.java          | 11 +++++++++++
 .../entity/LawsStandardizationLiaison.java        | 15 +++++++++++----
 .../entity/LawsStandardizationMeeting.java        |  7 +++++++
 .../entity/LawsStandardizationPayment.java        |  9 +++++++++
 .../impl/LawsStandardizationServiceImpl.java      |  3 ++-
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
index e01b00cc..a0c9ff24 100644
--- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
+++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java
@@ -125,8 +125,6 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
 
         for (SarFileCompareInfo info : pageList.getRecords()) {
             info.setReleaseStateTitle(ReleaseConditionEnum.getTextByValue(info.getReleaseState(), cut));
-//            info.setFileTypeLeft(getFileTypeText(info.getFileTypeLeft(), cut));
-//            info.setFileTypeRight(getFileTypeText(info.getFileTypeRight(), cut));
             // 根据编号赋值标准ID、标准来源、补充创建人
             setProperty(info, lawsDomesticStandards, lawsOverseasStandards, lawsEnterpriseStandards);
         }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java
index c6edcd1b..9043a8fc 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationGroup.java
@@ -1,5 +1,7 @@
 package com.jero.modules.laws.standardization.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.modules.laws.documenttool.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -31,38 +33,47 @@ public class LawsStandardizationGroup extends BaseEntity {
 	/**我司在工作组排名顺序*/
 	@Excel(name = "我司在工作组排名顺序", width = 15)
     @ApiModelProperty(value = "我司在工作组排名顺序")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String sort;
 	/**参会人员*/
 	@Excel(name = "参会人员", width = 15)
     @ApiModelProperty(value = "参会人员")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String personnel;
 	/**工号*/
 	@Excel(name = "工号", width = 15)
     @ApiModelProperty(value = "工号")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String jobNum;
 	/**单位*/
 	@Excel(name = "单位", width = 15)
     @ApiModelProperty(value = "单位")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String unit;
 	/**提出部门*/
 	@Excel(name = "提出部门", width = 15)
     @ApiModelProperty(value = "提出部门")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String department;
 	/**电话*/
 	@Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String phone;
 	/**邮箱*/
 	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String mailbox;
 	/**身份*/
 	@Excel(name = "身份", width = 15)
     @ApiModelProperty(value = "身份")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String identity;
 	/**资料*/
 	@Excel(name = "资料", width = 15)
     @ApiModelProperty(value = "资料")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.String feeData;
 	/**部门code*/
 	@Excel(name = "部门code", width = 15)
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java
index 2763d440..6e9c3b62 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationLiaison.java
@@ -1,5 +1,7 @@
 package com.jero.modules.laws.standardization.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.modules.laws.documenttool.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -28,25 +30,30 @@ public class LawsStandardizationLiaison extends BaseEntity {
 	@Excel(name = "标准化活动ID", width = 15)
     @ApiModelProperty(value = "标准化活动ID")
     private String standardizationId;
-	/**联络人ID*/
-	@Excel(name = "联络人ID", width = 15)
-    @ApiModelProperty(value = "联络人ID")
-    private String liaisonId;
+	/**联络人*/
+	@Excel(name = "联络人", width = 15)
+    @ApiModelProperty(value = "联络人")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private String liaison;
 	/**会议名称*/
 	@Excel(name = "会议名称", width = 15)
     @ApiModelProperty(value = "会议名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String name;
 	/**单位*/
 	@Excel(name = "单位", width = 15)
     @ApiModelProperty(value = "单位")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String unit;
 	/**电话*/
 	@Excel(name = "电话", width = 15)
     @ApiModelProperty(value = "电话")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String phone;
 	/**邮箱*/
 	@Excel(name = "邮箱", width = 15)
     @ApiModelProperty(value = "邮箱")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String mailbox;
     /**部门code*/
 	@Excel(name = "部门code", width = 15)
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java
index 479ddd52..bb9088e3 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationMeeting.java
@@ -1,5 +1,7 @@
 package com.jero.modules.laws.standardization.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jero.modules.laws.documenttool.entity.BaseEntity;
@@ -37,19 +39,24 @@ public class LawsStandardizationMeeting extends BaseEntity {
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "参会日期")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date participationTime;
 	/**会议名称*/
 	@Excel(name = "会议名称", width = 15)
     @ApiModelProperty(value = "会议名称")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String name;
 	/**参会人员*/
 	@Excel(name = "参会人员", width = 15)
     @ApiModelProperty(value = "参会人员")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String personnel;
 	/**会议资料*/
 	@Excel(name = "会议资料", width = 15)
     @ApiModelProperty(value = "会议资料")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String meetingData;
+    /**部门code*/
 	@Excel(name = "部门code", width = 15)
     @ApiModelProperty(value = "部门code")
     private String orgCode;
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java
index a0957c14..9b9f5609 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardizationPayment.java
@@ -1,5 +1,7 @@
 package com.jero.modules.laws.standardization.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.modules.laws.documenttool.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -31,30 +33,37 @@ public class LawsStandardizationPayment extends BaseEntity {
 	/**费用*/
 	@Excel(name = "费用", width = 15)
     @ApiModelProperty(value = "费用")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String fee;
 	/**年份*/
 	@Excel(name = "年份", width = 15)
     @ApiModelProperty(value = "年份")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String year;
 	/**整改状态(1-待整改、2-整改中、3-审批中、4-已完成)*/
 	@Excel(name = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)", width = 15)
     @ApiModelProperty(value = "整改状态(1-待整改、2-整改中、3-审批中、4-已完成)")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String state;
 	/**计划内*/
 	@Excel(name = "计划内", width = 15)
     @ApiModelProperty(value = "计划内")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String plan;
 	/**缴费方式*/
 	@Excel(name = "缴费方式", width = 15)
     @ApiModelProperty(value = "缴费方式")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String pay;
 	/**费用列支*/
 	@Excel(name = "费用列支", width = 15)
     @ApiModelProperty(value = "费用列支")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String feeListing;
 	/**资料*/
 	@Excel(name = "资料", width = 15)
     @ApiModelProperty(value = "资料")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String feeData;
 	/**部门code*/
 	@Excel(name = "部门code", width = 15)
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
index 244625a4..54e5f43f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -337,7 +338,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			// 填充上级节点名称
 			LawsStandardization standardization = getOne(new LambdaQueryWrapper<LawsStandardization>()
 					.eq(LawsStandardization::getId, lawsStandardization.getPid()));
-			if (StringUtils.isNotBlank(standardization.getName())){
+			if (!Objects.isNull(standardization) && StringUtils.isNotBlank(standardization.getName())){
 				lawsStandardization.setSupperName(standardization.getName());
 			}
 		}