diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java index 13e787b3..4c7da815 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java @@ -337,4 +337,9 @@ public interface ISysUserService extends IService { * @return */ List LawsWorkingGroupUserSearch(String userName, String userWorkNo, String userRoleName, String userPostName); + + /** + * 根据username"登陆账号"返回"用户名(工号)" + */ + String getNameNoByUsername(String userName); } diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index fa5b5060..08314dd3 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -673,6 +673,19 @@ public class SysUserServiceImpl extends ServiceImpl impl return userRoles.stream().map(SysUser::getId).distinct().collect(Collectors.toList()); } + @Override + public String getNameNoByUsername(String userName) { + if (StringUtils.isBlank(userName)){ + return ""; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUser::getUsername, userName); + wrapper.eq(SysUser::getDelFlag, "0"); + wrapper.last("limit 1"); + SysUser sysUser = getOne(wrapper); + return sysUser == null ? userName : sysUser.getUsername() + "(" + sysUser.getWorkNo() + ")"; + } + @Override @Transactional(rollbackFor = Exception.class) diff --git a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java index 9527214a..9aedb855 100644 --- a/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java @@ -23,6 +23,7 @@ import com.jero.modules.laws.standard.entity.LawsOverseasStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsDomesticStandardService; import com.jero.modules.laws.standard.service.ILawsOverseasStandardService; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.MyStringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,6 +64,8 @@ public class SarFileCompareInfoController extends JeroController