ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(企标稽查计划): 业务表翻译

Browse Source
This commit is contained in:
yjz
2023-11-22 09:55:58 +08:00
parent c2b0e6c59e
commit 8f96bf08fa
8 changed files with 134 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java
+14 -5
View File
@@ -1,22 +1,23 @@
package com.jero.modules.system.service;
import java.util.*;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.common.system.vo.SysUserCacheInfo;
import com.jero.modules.system.entity.SysUser;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.system.model.SysUserSysDepartModel;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* <p>
* 用户表 服务类
@@ -330,4 +331,12 @@ public interface ISysUserService extends IService<SysUser> {
* 根据username"登陆账号"返回"用户名(工号)"
*/
String getNameNoByUsername(String userName);
/**
* 通过 id 或 username 翻译 用户名（工号）
* @param ids ：“1,2,3”
* @param userNames：“admin,test”
* @return
*/
String dictByIdsOrUserNames(String ids, String userNames);
}
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+35 -2
View File
@@ -375,7 +375,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
/**
* 校验用户是否有效
* 校验用户是否有效
* @param sysUser
* @return
*/
@@ -391,7 +391,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
//情况2：根据用户信息查询，该用户已注销
//update-begin---author:王帅 Date:20200601 for：if条件永远为falsebug------------
if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) {
//update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------
//update-end---author:王帅 Date:20200601 for：if条件永远为falsebug------------
baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null);
return Result.error("该用户已注销");
}
@@ -652,6 +652,39 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return sysUser == null ? userName : sysUser.getRealname() + "（" + sysUser.getUsername() + "）";
}
@Override
public String dictByIdsOrUserNames(String ids, String userNames) {
List<String> sysList = new ArrayList<>();
if (StringUtils.isNotBlank(ids)){
List<String> list = Arrays.asList(ids.split(","));
List<SysUser> sysUserList = list(new LambdaQueryWrapper<SysUser>()
.in(SysUser::getId, list));
// 按顺序排序翻译
for (String item : list) {
Optional<SysUser> optionalSysUser = sysUserList.stream().filter(v -> v.getId().equals(item)).findFirst();
optionalSysUser.ifPresent(v -> sysList.add(v.getRealname() + "（" + v.getUsername() + "）"));
}
}else if (StringUtils.isNotBlank(userNames)){
List<String> list = Arrays.asList(userNames.split(","));
List<SysUser> sysUserList = list(new LambdaQueryWrapper<SysUser>()
.in(SysUser::getUsername, list));
// 按顺序排序翻译
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() + "）"));
}
}else {
return "";
}
if (!sysList.isEmpty()){
return String.join(",", sysList);
}else if (StringUtils.isNotBlank(ids)){
return ids;
}else {
return userNames;
}
}
@Override
@Transactional(rollbackFor = Exception.class)