From 491848aaacfe82d1743a299cb478c608c87bf2bc Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sat, 2 Jul 2022 14:07:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95--?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectLawsInventoryEOServiceImpl.java    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index bb75562ad..dca30e633 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -2369,8 +2369,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//认证级别
 			if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
 				List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue());
-				String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(","));
-				projectLawsInventoryEO.setAttestationRank(attestationRankName);
+				List<String> attestationRankList = Arrays.asList(projectLawsInventoryEO.getAttestationRank().split(","));
+				StringBuilder attestationRankBuilder = new StringBuilder();
+				for (String midAttestationRank : attestationRankList) {
+					String dutyTerritoryName = attestationRank.stream().filter(e -> e.getItemValue().equals(midAttestationRank)).map(f -> f.getItemText()).collect(Collectors.joining(","));
+					attestationRankBuilder.append(dutyTerritoryName).append(",");
+				}
+				projectLawsInventoryEO.setAttestationRank(attestationRankBuilder.substring(0, attestationRankBuilder.toString().length() - 1));
 			} else {
 				projectLawsInventoryEO.setAttestationRank("空");
 			}
@@ -2731,13 +2736,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			//认证级别
 			if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
 				List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue());
-				String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(","));
-				projectLawsInventoryEO.setAttestationRank(attestationRankName);
+				List<String> attestationRankList = Arrays.asList(projectLawsInventoryEO.getAttestationRank().split(","));
+				StringBuilder attestationRankBuilder = new StringBuilder();
+				for (String midAttestationRank : attestationRankList) {
+					String dutyTerritoryName = attestationRank.stream().filter(e -> e.getItemValue().equals(midAttestationRank)).map(f -> f.getItemText()).collect(Collectors.joining(","));
+					attestationRankBuilder.append(dutyTerritoryName).append(",");
+				}
+				projectLawsInventoryEO.setAttestationRank(attestationRankBuilder.substring(0, attestationRankBuilder.toString().length() - 1));
 			} else {
 				projectLawsInventoryEO.setAttestationRank("null");
 			}
 
-
 			//责任领域
 			if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) {
 				List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());

From 19cef7e0ac5155b88abc56eea9de1a1042b39bf6 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Sat, 2 Jul 2022 14:41:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tools/UserMenu.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index a52b3a8c9..959556614 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -44,8 +44,8 @@
     </div>
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
-        <a-avatar class="avatar" size="small" :src="getAvatar()"/>
-        <!--        <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>-->
+<!--        <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
+                <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
         <!--        <a-menu-item key="0">-->
@@ -209,7 +209,7 @@
       },
       /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       ...mapActions(['Logout']),
-      ...mapGetters(['nickname', 'avatar', 'userInfo']),
+      ...mapGetters(['username', 'avatar', 'userInfo']),
       getAvatar() {
         return getFileAccessHttpUrl(this.avatar())
       },