3-11 bug 修复

This commit is contained in:
yuezhihang
2022-03-11 18:10:27 +08:00
parent 2d95a7c31f
commit 0d4bc28382
3 changed files with 8 additions and 1 deletions
@@ -72,5 +72,8 @@ public class SysLog extends BaseEntity {
@TableField(exist = false)
private String dept;
@TableField(exist = false)
private String accountName;
}
@@ -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();
}
@@ -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