sumit

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/service/impl/CdExamRoomServiceImpl.java

@@ -115,6 +115,9 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
     @Override
     public List<CdExamRoomVo> getExamRoomList(CdExamRoomQuery bo) {
         List<CdExamRoomVo> result = new ArrayList<>();
+        if (ObjectUtils.isNotNull(bo.getTenantId())){
+           bo.setTenantId(getTenantId(bo.getTenantId()));
+        }
         List<CdExamRoom> cdExamRoomList = list(new LambdaQueryWrapper<CdExamRoom>()
                 .eq(ObjectUtils.isNotNull(bo.getTenantId()), CdExamRoom::getTenantId, bo.getTenantId())
                 .eq(ObjectUtils.isNotNull(bo.getApplyTime()), CdExamRoom::getExamTime, bo.getApplyTime())
@@ -602,6 +605,24 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
         return tenant.getTenantId();
     }
 
+    /**
+     * 获取机构ID
+     * @author change
+     * @date 2023/7/17 10:13
+     * @param tenantId
+     * @return java.lang.Long
+     */
+    private Long getTenantId(Long tenantId){
+        DataTenant tenant = dataTenantService.getOne(new LambdaQueryWrapper<DataTenant>()
+        .eq(DataTenant::getStatus,1)
+        .and(x -> x.eq(DataTenant::getNewId,tenantId).or().eq(DataTenant::getOldId,tenantId)));
+        if (ObjectUtils.isNull(tenant)){
+            throw new CustomException("机构信息不匹配，请检查！");
+        }
+        return tenant.getTenantId();
+    }
+
+
     /**
      * 获取机构ID
      * @author change

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/vo/CdExamRoomDetailVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 public class CdExamRoomDetailVo implements Serializable {
 
     @ApiModelProperty("id")
-    private String id;
+    private Long examId;
 
     @ApiModelProperty("考试标识")
     private String examName;