WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_bug_first_stage' 到 'master'

Browse Source 
Fix bug first stage

查看合并请求 laws-nio/laws-weilai!36
This commit is contained in:
李雪涛
2022-07-02 14:51:21 +08:00
parent 52db5c3df3 19cef7e0ac
commit f592a032a4
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+14 -5
View File
@@ -2369,8 +2369,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//认证级别 //认证级别
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); 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(",")); List<String> attestationRankList = Arrays.asList(projectLawsInventoryEO.getAttestationRank().split(","));
projectLawsInventoryEO.setAttestationRank(attestationRankName); 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 { } else {
projectLawsInventoryEO.setAttestationRank("空"); projectLawsInventoryEO.setAttestationRank("空");
} }
@@ -2731,13 +2736,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//认证级别 //认证级别
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); 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(",")); List<String> attestationRankList = Arrays.asList(projectLawsInventoryEO.getAttestationRank().split(","));
projectLawsInventoryEO.setAttestationRank(attestationRankName); 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 { } else {
projectLawsInventoryEO.setAttestationRank("null"); projectLawsInventoryEO.setAttestationRank("null");
} }
//责任领域 //责任领域
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) {
List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
jero-web/src/components/tools/UserMenu.vue
+3 -3
View File
@@ -44,8 +44,8 @@
</div> </div>
<a-dropdown> <a-dropdown>
<span class="action action-full ant-dropdown-link user-dropdown-menu"> <span class="action action-full ant-dropdown-link user-dropdown-menu">
<a-avatar class="avatar" size="small" :src="getAvatar()"/> <!-- <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
<!-- <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>--> <span v-if="isDesktop()">welcome,{{ userInfo().username }}</span>
</span> </span>
<a-menu slot="overlay" class="user-dropdown-menu-wrapper"> <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
<!-- <a-menu-item key="0">--> <!-- <a-menu-item key="0">-->
@@ -209,7 +209,7 @@
}, },
/* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/ /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
...mapActions(['Logout']), ...mapActions(['Logout']),
...mapGetters(['nickname', 'avatar', 'userInfo']), ...mapGetters(['username', 'avatar', 'userInfo']),
getAvatar() { getAvatar() {
return getFileAccessHttpUrl(this.avatar()) return getFileAccessHttpUrl(this.avatar())
}, },