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

【修改】去掉工号+姓名字段，获取工号+姓名以唯一值进行展示处理

Browse Source
This commit is contained in:
zer0Black
2023-09-29 22:16:15 +08:00
parent b1f86f3be2
commit 65115fe31b
7 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+1 -1
View File
@@ -449,7 +449,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.in(SysUser::getId, valueList);
List<SysUser> userList = sysUserService.list(sysUserLambdaQueryWrapper);
List<String> nameList = userList.stream().map(SysUser::getNameWorkNo).collect(Collectors.toList());
List<String> nameList = userList.stream().map(SysUser::getUsername).collect(Collectors.toList());
resultMap.put(key + FieldCommon._DICT_TEXT, StringUtils.join(nameList, ","));
} else if (LawsFieldTypeEnum.GROUP_SINGLE.getValue().equals(lawsTag.getFieldShowType())
|| LawsFieldTypeEnum.GROUP_MANY.getValue().equals(lawsTag.getFieldShowType())) {
laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+2 -2
View File
@@ -298,7 +298,7 @@ public class ImportUtil {
// 单选用户转换
public String convertSingleUserId(String cellValue) {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.eq(SysUser::getNameWorkNo, cellValue);
sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
return sysUserService.getOne(sysUserLambdaQueryWrapper).getId();
}
@@ -389,7 +389,7 @@ public class ImportUtil {
// 单选人员
public boolean singleUserValid(String cellValue) {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.eq(SysUser::getNameWorkNo, cellValue);
sysUserLambdaQueryWrapper.eq(SysUser::getUsername, cellValue);
return Objects.nonNull(sysUserService.getOne(sysUserLambdaQueryWrapper));
}
laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+2 -2
View File
@@ -113,8 +113,8 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
StringJoiner joiner = new StringJoiner(",");
for (String id : collect) {
SysUser sysUser = sysUserService.getById(id);
if (sysUser != null && StringUtils.isNotBlank(sysUser.getWorkNo())) {
joiner.add(sysUser.getWorkNo());
if (sysUser != null && StringUtils.isNotBlank(sysUser.getUsername())) {
joiner.add(sysUser.getUsername());
}
}
workNo = joiner.toString();
laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+1 -1
View File
@@ -149,7 +149,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
SysUser sysUser = userMap.get(user.getUserId());
if (sysUser != null) {
user.setUserName(sysUser.getRealname());
user.setUserWorkNo(sysUser.getWorkNo());
user.setUserWorkNo(sysUser.getUsername());
user.setUserPostName("岗位xxx");
}
LambdaQueryWrapper<SysUserRole> wrapper = Wrappers.lambdaQuery();