From 0d187581789104d37bd1fd80252ee8fe7e0f7afd Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 27 Oct 2021 13:47:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=A0=87=E5=87=86=E7=BB=B4=E5=BA=A6-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandItemsServiceImpl.java | 5 +++-- .../controller/SarStandardsInfoController.java | 2 +- .../service/ISarStandardsInfoService.java | 2 +- .../service/impl/SarStandardsInfoServiceImpl.java | 11 +++-------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index fe2fab56..1d823c88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -10,6 +10,7 @@ import com.adc.da.slrs.sarStandardsInfo.controller.SarStandardsInfoController; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; +import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,7 +40,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; try { - pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page,"1").getData().getList(); + pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); } catch (Exception e) { e.printStackTrace(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 33caf3c4..b1746b6a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -179,7 +179,7 @@ public class SarStandardsInfoController extends BaseController if(page.getUserId() == null || page.getUserId().equals("")){ page.setUserId(LoginUserUtil.getUserId()); } - List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page,mark); + List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 0ef2e354..9fcbf007 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -19,7 +19,7 @@ public interface ISarStandardsInfoService extends IService { // void reverseQueryStand(List ids, String standName,String type); - List getSarStandardsInfoPage(SarStandardsInfoEOPage page,String mark) throws Exception; + List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; List getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index b3f9ecdf..4b4539fa 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -286,7 +286,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception { - public List getSarStandardsInfoPage(SarStandardsInfoEOPage page,String mark) throws Exception { //查询当前登录人角色拥有权限的菜单 if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){ QueryWrapper qw = new QueryWrapper<>(); @@ -309,11 +308,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl sarlist = dao.getSarStandardsInfoPage(page); - if ("0".equals(mark)) { - attrInfoCollect(sarlist); - }else { - attrInfo(sarlist); - } + attrInfoCollect(sarlist); return sarlist; } @@ -392,7 +387,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { String value = entry.getValue().toString(); String selVal = InitStandAttrUtil.selectFieldMap.get(name); if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) { @@ -487,7 +482,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileObj = attFileEOService.getMultiFileInfos(value); entry.setValue(fileObj); - //以标准id和文本类型查询分解单表 有数据设标记为为 1 + //以标准id和文本类型查询分解单表 有数据设标记为为 1 FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO(); sarItemCount.setStandId(row.getId()); sarItemCount.setFileType(name);