fix(标准宣贯流程): 79571、草稿存储人员信息

This commit is contained in:
yjz
2023-12-27 13:59:43 +08:00
parent d67da3f18d
commit 1291666d42
20 changed files with 102 additions and 9 deletions
@@ -222,7 +222,7 @@
</select>
<select id="translateUserRealNameFromTableByKeys" resultType="com.jero.common.system.vo.DictModel">
select concat(realname,'',username,'') as "text", id as "value" from sys_user
select concat(realname,'(',username,')') as "text", id as "value" from sys_user
where id IN (
<foreach item="key" collection="keys" separator=",">
#{key}
@@ -340,7 +340,7 @@ public interface ISysUserService extends IService<SysUser> {
String getNameNoByUsername(String userName);
/**
* 通过 id 或 username 翻译 用户名工号
* 通过 id 或 username 翻译 用户名(工号)
* @param ids :“1,2,3”
* @param userNames:“admin,test”
* @return
@@ -348,7 +348,7 @@ public interface ISysUserService extends IService<SysUser> {
String dictByIdsOrUserNames(String ids, String userNames);
/**
* 通过 用户名工号查询用户
* 通过 用户名(工号)查询用户
* @param inspectUser
* @return
*/
@@ -676,7 +676,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 按顺序排序翻译
for (String item : list) {
Optional<SysUser> optionalSysUser = sysUserList.stream().filter(v -> v.getUsername().equals(item)).findFirst();
optionalSysUser.ifPresent(v -> sysList.add(v.getRealname() + "" + v.getUsername() + ""));
optionalSysUser.ifPresent(v -> sysList.add(v.getRealname() + "(" + v.getUsername() + ")"));
}
}else {
return "";