From 48933b44dc6610bc05132b55cb7c895fb26ae4a0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Sat, 10 Jul 2021 15:43:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarStandardsInfoServiceImpl.java           | 6 +++---
 .../slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java   | 2 +-
 .../resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 8c7cad7f..c432ee27 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -365,9 +365,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             //编写预警信息
 //            writeWarnings(sarStandardsInfoEO);
-            updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");
-            updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
-            updateRelateStand(sarStandardsInfoEO, "CBBH");
+//            updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");
+//            updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
+//            updateRelateStand(sarStandardsInfoEO, "CBBH");
             // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
             replaseStandState(sarStandardsInfoEO);
             // 处理属性表信息
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
index 4e979cfd..e93a057d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUpdLog/service/impl/SarUpdLogServiceImpl.java
@@ -257,7 +257,7 @@ public class SarUpdLogServiceImpl extends ServiceImpl<SarUpdLogDao, SarUpdLog> i
         sarUpdLogEO.setSarId(sarId);
         sarUpdLogEO.setSarType(sarType);
         sarUpdLogEO.setCreationTime(new Date());
-        sarUpdLogEO.setCreationUser(LoginUserUtil.getUserId());
+        sarUpdLogEO.setCreationUser(LoginUserUtil.getUserId() == null ? "" : LoginUserUtil.getUserId());
         sarUpdLogEO.setContent(content);
         dao.insert(sarUpdLogEO);
     }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml
index 93b7040c..7995e6de 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml
@@ -51,7 +51,7 @@
             SELECT SEQ_SAR_UPD_LOG.NEXTVAL FROM DUAL
         </selectKey> -->
         insert into SAR_UPD_LOG(<include refid="Base_Column_List" />)
-        values (#{id, jdbcType=VARCHAR}, #{sarType, jdbcType=VARCHAR}, #{sarId, jdbcType=VARCHAR}, #{content, jdbcType=CLOB}, #{creationTime, jdbcType=TIMESTAMP})
+        values (#{id, jdbcType=VARCHAR}, #{sarType, jdbcType=VARCHAR}, #{sarId, jdbcType=VARCHAR}, #{content, jdbcType=CLOB}, #{creationTime, jdbcType=TIMESTAMP},#{creationUser, jdbcType=VARCHAR})
     </insert>
 
     <!-- 动态插入记录 主键是序列 -->