项目评估流程标准维度-查询数据来源修复

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<SarStandItemsDao, SarS
     @Autowired
     private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
     @Autowired
-    private SarStandardsInfoController sarStandardsInfoController;
+    private ISarStandardsInfoService sarStandardsInfoService;
     @Autowired
     private SarStandItemsDao sarStandItemsDao;
 
@@ -155,7 +156,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         page.setUserId(null);
         List<SarStandardsInfo> pageInfo = null;
         try {
-            pageInfo = sarStandardsInfoController.getSarStandardsInfoPage(page,"1").getData().getList();
+            pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page);
         } catch (Exception e) {
             e.printStackTrace();
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -179,7 +179,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
         if(page.getUserId() == null || page.getUserId().equals("")){
             page.setUserId(LoginUserUtil.getUserId());
         }
-        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page,mark);
+        List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java

@@ -19,7 +19,7 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
 //    void reverseQueryStand(List<String> ids, String standName,String type);
 
-    List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page,String mark) throws Exception;
+    List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception;
 
     List<SarStandardsInfo> getSarStandardsInfoPageBak(SarStandardsInfoEOPage page) throws Exception;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -286,7 +286,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      */
     @Override
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
-    public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page,String mark) throws Exception {
         //查询当前登录人角色拥有权限的菜单
         if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
             QueryWrapper<TsResource> qw = new QueryWrapper<>();
@@ -309,11 +308,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         Integer rowCount = dao.getSarStandardsInfoCount(page);
         page.getPager().setRowCount(rowCount);
         List<SarStandardsInfo> sarlist = dao.getSarStandardsInfoPage(page);
-        if ("0".equals(mark)) {
+        attrInfoCollect(sarlist);
-            attrInfoCollect(sarlist);
-        }else {
-            attrInfo(sarlist);
-        }
         return sarlist;
     }
 
@@ -392,7 +387,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     if ("\"null\"".equals(entry.getValue())) {
                         entry.setValue("");
                     }
-                   if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 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<SarStandardsInfoDao
                         if (StringUtils.isNotBlank(value)) {
                             List<AttFileEO> fileObj = attFileEOService.getMultiFileInfos(value);
                             entry.setValue(fileObj);
-                          //以标准id和文本类型查询分解单表 有数据设标记为为 1
+                            //以标准id和文本类型查询分解单表 有数据设标记为为 1
                             FindSarItemsPageReqDTO sarItemCount = new FindSarItemsPageReqDTO();
                             sarItemCount.setStandId(row.getId());
                             sarItemCount.setFileType(name);