From 2d0520366daf28b158a45b98b0dec6c8326870f4 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 23 八月 2023 11:47:50 +0800
Subject: [PATCH] # 修改配置角色 报角色编码存在
---
server/src/main/resources/mappers/CompanyLogExtMapper.xml | 6 +++---
server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java | 9 +++++++--
server/src/main/java/doumeemes/dao/business/model/CompanyLog.java | 8 ++++++++
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java b/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
index 756134a..a197041 100644
--- a/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
+++ b/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
@@ -34,6 +34,10 @@
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private String createUserName;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createTime;
@@ -77,4 +81,8 @@
@ApiModelProperty(value = "瀹㈡埛绠�绉�" )
@TableField(exist = false)
private String shortName;
+
+ @ApiModelProperty(value = "瀹㈡埛绠�绉�" )
+ @TableField(exist = false)
+ private String userName;
}
diff --git a/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java
index f9f2089..e894a39 100644
--- a/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/CompanyLogServiceImpl.java
@@ -87,7 +87,7 @@
QueryWrapper<CompanyLog> wrapper = new QueryWrapper<>(companyLog);
return companyLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<CompanyLog> findPage(PageWrap<CompanyLog> pageWrap) {
IPage<CompanyLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -123,7 +123,12 @@
IPage<CompanyLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
Utils.MP.blankToNull(pageWrap.getModel());
- return PageData.from(companyLogExtMapper.selectPage(page, pageWrap.getModel().getCompanyName(),pageWrap.getModel().getUpdateType()));
+ IPage<CompanyLog> companyLogIPage = companyLogExtMapper.selectPage(page, pageWrap.getModel().getUserName(), pageWrap.getModel().getUpdateType());
+
+ if (!CollectionUtils.isEmpty(companyLogIPage.getRecords())){
+ companyLogIPage.getRecords().forEach(s->s.setShortName(s.getCompanyName()));
+ }
+ return PageData.from(companyLogIPage);
}
@Override
diff --git a/server/src/main/resources/mappers/CompanyLogExtMapper.xml b/server/src/main/resources/mappers/CompanyLogExtMapper.xml
index 79c6f31..5563aef 100644
--- a/server/src/main/resources/mappers/CompanyLogExtMapper.xml
+++ b/server/src/main/resources/mappers/CompanyLogExtMapper.xml
@@ -7,13 +7,13 @@
SELECT
co.name as companyName,
su.REALNAME as updateUserName,
- dept.name AS shortName,
+ suc.REALNAME as createUserName,
cl.*
FROM
company_log cl
LEFT JOIN company co ON cl.COMPANY_ID = co.id
LEFT JOIN SYSTEM_USER su ON su.id = cl.UPDATE_USER
- left join department dept on dept.COMPANY_ID = co.ID and dept.PARENT_ID IS NULL AND dept.TYPE != 4
+ LEFT JOIN SYSTEM_USER suc ON suc.id = cl.UPDATE_USER
<where>
<if test="companyName != null and companyName != ''">
co.name LIKE CONCAT('%',#{companyName},'%')
@@ -25,4 +25,4 @@
order by cl.id desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3