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

合并分支 'dev_third_stage' 到 'master'

Browse Source 
Dev third stage

查看合并请求 laws-nio/laws-weilai!160
This commit is contained in:
李雪涛
2022-08-26 09:18:25 +08:00
parent 99b578fbf4 011963e1ca
commit 60d140e797
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java
+2 -1
View File
@@ -17,6 +17,7 @@ import com.jero.modules.split.entity.SarFileSplitMenuEO;
import com.jero.modules.split.service.IFileSplitItemsEOService; import com.jero.modules.split.service.IFileSplitItemsEOService;
import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.split.service.ISarFileSplitInfoService;
import com.jero.modules.split.service.ISarFileSplitMenuEOService; import com.jero.modules.split.service.ISarFileSplitMenuEOService;
import com.jero.modules.system.util.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -275,7 +276,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
sfVo.setComments(sfcInfo.getComments()); sfVo.setComments(sfcInfo.getComments());
List<SarFileCompareMenu> menuList = sarFileCompareMenuService.queryListByInfoId(id); List<SarFileCompareMenu> menuList = sarFileCompareMenuService.queryListByInfoId(id);
for (SarFileCompareMenu menu : menuList) { for (SarFileCompareMenu menu : menuList) {
if ("General catalogue".equals(menu.getName())) { if (StringUtils.isBlank(menu.getParentId()) || "General catalogue".equals(menu.getName()) || "General Catalogue".equals(menu.getName())) {
if (menu.getLeftOrRight().equals(CompareConst.POS_LEFT)) { if (menu.getLeftOrRight().equals(CompareConst.POS_LEFT)) {
SarFileCompareMenuVo menuLeft = new SarFileCompareMenuVo(menu); SarFileCompareMenuVo menuLeft = new SarFileCompareMenuVo(menu);
menuLeft.setChildren(getMenuChildren(menuList, CompareConst.POS_LEFT, menuLeft.getMenuId())); menuLeft.setChildren(getMenuChildren(menuList, CompareConst.POS_LEFT, menuLeft.getMenuId()));
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+3 -3
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap"> <div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0"> <div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title"> <div class="doc-detail-title">
<span style="line-height: 66px;display: inline-block;float: left"> <!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<a-icon type="arrow-left" style="margin-right: 6px;"/> <!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
</span> <!-- </span>-->
{{$t('managePublishing')}} {{$t('managePublishing')}}
</div> </div>
</div> </div>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+3 -3
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap"> <div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0"> <div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title"> <div class="doc-detail-title">
<span style="line-height: 66px;display: inline-block;float: left"> <!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<a-icon type="arrow-left" style="margin-right: 6px;"/> <!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
</span> <!-- </span>-->
{{header_text}} {{header_text}}
</div> </div>
</div> </div>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+3 -3
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap"> <div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0"> <div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title"> <div class="doc-detail-title">
<span style="line-height: 66px;display: inline-block;float: left" @click="backClick"> <!-- <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
<a-icon type="arrow-left" style="margin-right: 6px;"/> <!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
</span> <!-- </span>-->
{{$t('managePublishing')}} {{$t('managePublishing')}}
</div> </div>
</div> </div>