diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java index 0dd2c655..4d7499ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/controller/SarLawsInformationController.java @@ -107,7 +107,7 @@ public class SarLawsInformationController extends BaseController exportLawsInformationInfo(SarLawsInformation sarLawsInformation, HttpServletResponse response, + public ResponseMessage exportLawsInformationInfo(SarLawsInformation sarLawsInformation, String userId, HttpServletResponse response, HttpServletRequest request) { OutputStream os = null; Workbook workbook = null; @@ -119,13 +119,16 @@ public class SarLawsInformationController extends BaseController idList = Arrays.asList(sarLawsInformation.getExportIds().split(",")); datas = informationService.getLawsInformationByIds(idList); } else { // 导出所有数据 - datas = informationService.getAllLawsInformation(sarLawsInformation); + datas = informationService.getAllLawsInformation(sarLawsInformation, userId); } List datasExport = new ArrayList<>(); for (SarLawsInformation data : datas) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java index a338297f..21a94931 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/SarLawsInformationService.java @@ -36,7 +36,7 @@ public interface SarLawsInformationService extends IService * @param sarLawsInformation 法规资料对象,用于查询 * @return 法规资料列表 */ - List getAllLawsInformation(SarLawsInformation sarLawsInformation); + List getAllLawsInformation(SarLawsInformation sarLawsInformation, String userId); ResponseMessage importLawsInformationInfo(MultipartFile file); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java index 54c4be20..9fbfa59f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java @@ -355,8 +355,7 @@ public class SarLawsInformationServiceImpl extends ServiceImpl getAllLawsInformation(SarLawsInformation sarLawsInformation) { - String userId = LoginUserUtil.getUserId(); + public List getAllLawsInformation(SarLawsInformation sarLawsInformation, String userId) { // 查询有权限的资料ID LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SarLawsInformationAuth::getUserId, userId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index fdf09eb5..17d66f71 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -156,22 +156,11 @@ public class SarLawsTopicServiceImpl extends ServiceImpl compareList = compareLawsTopic(lawsTopicInfoDB, lawsTopic); if (compareLawsTopic(lawsTopicInfoDB, lawsTopic).size() == 0) { return true; } lawsTopic.setModifyTime(new Date()); - for (String s : compareList) { - log.error("====================变更项====================" + s); - } int update = this.baseMapper.updateById(lawsTopic); // 比较列表字段是否经过修改,如果经过修改,先删除,再添加 if (compareList.contains("课题组会议列表被变更")) {