3/6

src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -139,9 +139,10 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         } catch (Exception e) {
             throw new XiaoShiException("未查询到当前登陆人");
         }
+        Integer tenantId = personnelVO.getTenantId();
         LambdaQueryWrapper<InvalidRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(InvalidRecord::getPatentNo, patentNo)
-                .eq(InvalidRecord::getTenantId, personnelVO.getTenantId());
+                .eq(InvalidRecord::getTenantId, tenantId);
         List<InvalidRecord> invalidRecords = this.list(queryWrapper);
 
         if (!invalidRecords.isEmpty()) {
@@ -225,6 +226,13 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
     }
 
     public List<InvalidRecordVO> findInvalidRecord(String patentNo, List<InvalidRecordVO> invalidRecordVOS){
+        PersonnelVO personnelVO = new PersonnelVO();
+        try {
+            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        } catch (Exception e) {
+            throw new XiaoShiException("未查询到当前登陆人");
+        }
+        Integer tenantId = personnelVO.getTenantId();
         List<InvalidRecordVO> finalVOS = new ArrayList<>();
         finalVOS.addAll(invalidRecordVOS);
         LambdaQueryWrapper<ReportProject> queryWrapper = new LambdaQueryWrapper<>();
@@ -233,37 +241,39 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         if (!reportProjects.isEmpty()) {
             reportProjects.forEach(item -> {
                 Project project = projectService.getById(item.getProjectId());
-                Integer type = item.getReportType();
-                if (type.equals(7)) {
-                    //报告类型为官方无效
-                    InvalidRecordVO invalidRecordVO = new InvalidRecordVO();
-                    invalidRecordVO.setInvalidCaseNum(item.getCaseNumber());
-                    invalidRecordVO.setInvalidApplicant(item.getInvalidApplication());
-                    invalidRecordVO.setPatentNo(patentNo);
-                    //无效请求书
-                    Integer affairType = 1;
-                    Date invalidTime = this.loadInvalidTime(affairType, item);
-                    invalidRecordVO.setInvalidTime(invalidTime);
-                    Integer judgeType = 5;
-                    Date judgeTime = this.loadInvalidTime(judgeType, item);
-                    invalidRecordVO.setJudgementTime(judgeTime);
-                    invalidRecordVO.setCreateId(project.getCreateId());
-                    invalidRecordVO.setCreateTime(project.getCreateTime());
-                    List<String> fileGuids = this.loadFileGuids(item.getProjectId());
-                    invalidRecordVO.setFileGuids(fileGuids);
-                    invalidRecordVO.setIfAdd(false);
-                    //装载结果  先查询行政判决诉讼书
-                    Integer resultType = 5;
-                    String result = this.loadResult(resultType, item);
-                    invalidRecordVO.setResult(result);
-                    //带出报告信息
-                    ReportVO reportVO = new ReportVO();
-                    BeanUtils.copyProperties(item, reportVO);
-                    Integer projectId = item.getProjectId();
-                    Project reportProject = projectService.getById(projectId);
-                    reportVO.setReportName(reportProject.getName());
-                    invalidRecordVO.setReportVO(reportVO);
-                    finalVOS.add(invalidRecordVO);
+                if (project.getTenantId().equals(tenantId)) {
+                    Integer type = item.getReportType();
+                    if (type.equals(7)) {
+                        //报告类型为官方无效
+                        InvalidRecordVO invalidRecordVO = new InvalidRecordVO();
+                        invalidRecordVO.setInvalidCaseNum(item.getCaseNumber());
+                        invalidRecordVO.setInvalidApplicant(item.getInvalidApplication());
+                        invalidRecordVO.setPatentNo(patentNo);
+                        //无效请求书
+                        Integer affairType = 1;
+                        Date invalidTime = this.loadInvalidTime(affairType, item);
+                        invalidRecordVO.setInvalidTime(invalidTime);
+                        Integer judgeType = 5;
+                        Date judgeTime = this.loadInvalidTime(judgeType, item);
+                        invalidRecordVO.setJudgementTime(judgeTime);
+                        invalidRecordVO.setCreateId(project.getCreateId());
+                        invalidRecordVO.setCreateTime(project.getCreateTime());
+                        List<String> fileGuids = this.loadFileGuids(item.getProjectId());
+                        invalidRecordVO.setFileGuids(fileGuids);
+                        invalidRecordVO.setIfAdd(false);
+                        //装载结果  先查询行政判决诉讼书
+                        Integer resultType = 5;
+                        String result = this.loadResult(resultType, item);
+                        invalidRecordVO.setResult(result);
+                        //带出报告信息
+                        ReportVO reportVO = new ReportVO();
+                        BeanUtils.copyProperties(item, reportVO);
+                        Integer projectId = item.getProjectId();
+                        Project reportProject = projectService.getById(projectId);
+                        reportVO.setReportName(reportProject.getName());
+                        invalidRecordVO.setReportVO(reportVO);
+                        finalVOS.add(invalidRecordVO);
+                    }
                 }
             });
         }