skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -238,8 +238,10 @@ SgDeviceDO sgDeviceDO = new SgDeviceDO(); if (gxDeviceId == 999){ deviceType = "sgzb"; sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build()); }else if(gxDeviceId == 998){ deviceType = "sgys"; sgReportUserMapper.insert(SgReportUserDO.builder().reportId(sgProgressReportDO.getId()).roleId(Long.parseLong("1811657352658042882")).approvalStatus(0).approvalOrder(1).build()); }else { sgDeviceDO = sgDeviceMapper.selectById(gxDeviceId); deviceType = sgDeviceDO.getDeviceType(); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -52,7 +52,7 @@ public Object queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) { List<String> sgCodeS = getSgCodeByUser(); searchDTO.setSgCodeS(sgCodeS); setDeptId(searchDTO); // setDeptId(searchDTO); Boolean isPage = searchDTO.getIsPage(); if (isPage==null) isPage = true; if (isPage ){ @@ -303,7 +303,7 @@ */ @Override public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) { setDeptId(searchDTO); // setDeptId(searchDTO); List<SgProjectInfoVO> list = new ArrayList<>(); if(StringUtils.isNotBlank(searchDTO.getAdCode())){ list = sgProjectInfoMapper.progressList1(page, searchDTO); @@ -338,7 +338,8 @@ List<String> sgCodeS = getSgCodeByUser(); searchDTO.setSgCodeS(sgCodeS); setDeptId(searchDTO); return sgProjectInfoMapper.queryPageList(null,searchDTO); List<SgProjectInfoDO> list = sgProjectInfoMapper.queryPageList(null, searchDTO); return list; } /**
