From 25e8f2f36720cab190f766bfa80eb7b28e9923c0 Mon Sep 17 00:00:00 2001
From: caozhen <18736171426@139.com>
Date: Wed, 20 Sep 2023 17:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEusername"?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E8=B4=A6=E5=8F=B7"=E8=BF=94=E5=9B=9E"?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D(=E5=B7=A5=E5=8F=B7)=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E7=94=A8=E5=9C=A8=E6=96=87=E6=A1=A3=E6=AF=94?=
 =?UTF-8?q?=E5=AF=B9=E5=88=97=E8=A1=A8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/service/ISysUserService.java     |  5 +++++
 .../system/service/impl/SysUserServiceImpl.java     | 13 +++++++++++++
 .../controller/SarFileCompareInfoController.java    |  7 ++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

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<SysUser> {
 	 * @return
 	 */
 	List<String> 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<SysUserMapper, SysUser> impl
 		return userRoles.stream().map(SysUser::getId).distinct().collect(Collectors.toList());
 	}
 
+	@Override
+	public String getNameNoByUsername(String userName) {
+		if (StringUtils.isBlank(userName)){
+			return "";
+		}
+		LambdaQueryWrapper<SysUser> 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<SarFileCompareI
     private ILawsOverseasStandardService lawsOverseasStandardService; //海外标准
     @Autowired
     private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
+    @Autowired
+    private ISysUserService sysUserService;
 
     /**
      * 分页列表查询
@@ -100,7 +103,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
             info.setReleaseStateTitle(ReleaseConditionEnum.getTextByValue(info.getReleaseState(), cut));
             info.setFileTypeLeft(getFileTypeText(info.getFileTypeLeft(), cut));
             info.setFileTypeRight(getFileTypeText(info.getFileTypeRight(), cut));
-            //根据左右标准编号赋值标准ID、标准来源4个字段值
+            //根据左右标准编号赋值标准ID、标准来源4个字段值，补充创建人
             this.assignment(info);
         }
         return Result.OK(pageList);
@@ -147,6 +150,8 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
                 }
             }
         }
+        String nameNoByUsername = sysUserService.getNameNoByUsername(info.getCreateBy());
+        info.setCreateBy(nameNoByUsername);
     }
 
     private String getFileTypeText(String fileType, String cut) {