From 0d4bc28382176aa803650954bab0d8f6dcb69a0e Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 11 Mar 2022 18:10:27 +0800
Subject: [PATCH] =?UTF-8?q?3-11=20bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java   | 3 +++
 .../src/main/java/com/adc/da/utils/util/StandExportUtil.java  | 4 ++++
 .../src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
index bb1adb80..9d1caa52 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sysLog/entity/SysLog.java
@@ -72,5 +72,8 @@ public class SysLog extends BaseEntity {
     @TableField(exist = false)
     private String dept;
 
+    @TableField(exist = false)
+    private String accountName;
+
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
index 20781939..d9f16c12 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/StandExportUtil.java
@@ -44,6 +44,10 @@ public class StandExportUtil {
                 }
             }
             String header = FieldConvertUtil.exportBaseFieldNames + "," +  attrBud.toString();
+            //国内导出去掉体系类别
+            if (SarTypeEnum.INLAND_STAND.getValue().equals(standType)) {
+                header = header.replace(",体系类别","");
+            }
             if (SarTypeEnum.FOREIGN_STAND.getValue().equals(standType)) {
                 header = FieldConvertUtil.exportBaseFieldNamesForeign + "," +  attrBud.toString();
             }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml
index 8d75e281..a30376ca 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sysLog/SysLogMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.sysLog.dao.SysLogDao">
 
     <select id="queryAllLog" parameterType="com.adc.da.slrs.sysLog.vo.SysLogReqDTO" resultType="com.adc.da.slrs.sysLog.entity.SysLog">
-        select ts_user.account,ts_institution.name dept,sys_log.oper_time,sys_log.oper,sys_log.special  from sys_log
+        select ts_user.account,ts_user.UNAME as accountName,ts_institution.name dept,sys_log.oper_time,sys_log.oper,sys_log.special  from sys_log
         left join ts_user on sys_log.user_id = ts_user.usid
         left join ts_institution on ts_user.institution_id = ts_institution.id
         WHERE 1=1