Explorar el Código

注释获取 计划列表数据 时去判断 计划是否存在已完成任务

zhulu hace 1 año
padre
commit
951b5ca0b5

+ 2 - 2
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/TMonitoringRetrievalPlanController.java

@@ -56,8 +56,8 @@ public class TMonitoringRetrievalPlanController extends BaseController {
         AjaxResult ajax = AjaxResult.success();
         TableDataInfo<TMonitoringRetrievalPlanVO> tMonitoringRetrievalPlanTableDataInfo = tMonitoringRetrievalPlanService.selectPage(tMonitoringRetrievalPlan);
         ajax.put("data", tMonitoringRetrievalPlanTableDataInfo);
-        SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
-        ajax.put("isEdit", sysOrg.getId());
+//        SysOrg sysOrg = remoteOrgService.selectSysOrgById(SecurityUtils.getLoginUser().getOrgId(), SecurityConstants.INNER);
+        ajax.put("isEdit", SecurityUtils.getLoginUser().getOrgId());
         return ajax;
     }
 

+ 4 - 4
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -149,10 +149,10 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         //获取数据
 
         page = tMonitoringRetrievalPlanMapper.selectPageList(page, tMonitoringRetrievalPlan, SecurityUtils.getLoginUser().getOrgId());
-        page.getRecords().forEach(p -> {
-            boolean isComplete = this.getIsComplete(p.getId());
-            p.setIsComplete(isComplete);
-        });
+//        page.getRecords().forEach(p -> {
+//            boolean isComplete = this.getIsComplete(p.getId());
+//            p.setIsComplete(isComplete);
+//        });
         return TableDataInfo.build(page);
     }