1

src/main/java/com/fdkankan/fusion/controller/CaseTabulationController.java

@@ -58,11 +58,7 @@ public class CaseTabulationController extends BaseController{
 
     @GetMapping("/info")
     public ResultData info (@RequestParam (required = false) String tabulationId){
-        CaseTabulation caseTabulation = caseTabulationService.getById(tabulationId);
-        if(caseTabulation == null){
-            throw new BusinessException(ResultCode.RECORD_NOT_EXIST);
-        }
-        caseOverviewService.checkLoginUser(null,caseTabulation,"view");
+        CaseTabulation caseTabulation = caseTabulationService.info(tabulationId,"view");
         return ResultData.ok(caseTabulation);
     }
 
@@ -77,7 +73,7 @@ public class CaseTabulationController extends BaseController{
     public ResultData addOrUpdate (@RequestBody CaseTabulation caseTabulation){
 
         if(caseTabulation.getId() != null){
-            caseOverviewService.checkLoginUser(null,caseTabulationService.getById(caseTabulation.getId()),"edit");
+             caseTabulationService.info(caseTabulation.getId().toString(),"edit");
         }else {
             caseTabulation.setPlatformId(getPlatformId());
             caseTabulation.setSysUserId(getSysUserId());
@@ -115,7 +111,7 @@ public class CaseTabulationController extends BaseController{
     @PostMapping("/del")
     public ResultData del (@RequestBody CaseTabulation caseTabulation){
         if(caseTabulation.getId() != null){
-            caseOverviewService.checkLoginUser(null,caseTabulationService.getById(caseTabulation.getId()),"edit");
+            caseTabulationService.info(caseTabulation.getId().toString(),"edit");
         }
         caseTabulationService.removeById(caseTabulation.getId());
         return ResultData.ok();

src/main/java/com/fdkankan/fusion/service/ICaseTabulationService.java

@@ -29,4 +29,6 @@ public interface ICaseTabulationService extends IService<CaseTabulation> {
     void updateCaseByOverIds(List<Integer> overviewIds, Integer caseId);
 
     void updateCaseByIds(List<Integer> tabulationIds,  Integer caseId);
+
+    CaseTabulation info(String tabulationId,String pageType);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseOverviewServiceImpl.java

@@ -217,7 +217,6 @@ public class CaseOverviewServiceImpl extends ServiceImpl<ICaseOverviewMapper, Ca
             }
         }
 
-
         throw new BusinessException(ResultCode.NOT_PER);
 
     }

src/main/java/com/fdkankan/fusion/service/impl/CaseTabulationServiceImpl.java

@@ -4,10 +4,12 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
 import com.fdkankan.fusion.entity.CaseFiles;
 import com.fdkankan.fusion.entity.CaseOverview;
 import com.fdkankan.fusion.entity.CaseTabulation;
+import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.client.FdKKClient;
 import com.fdkankan.fusion.httpClient.request.AddMediaLibraryParam;
 import com.fdkankan.fusion.mapper.ICaseTabulationMapper;
@@ -108,4 +110,18 @@ public class CaseTabulationServiceImpl extends ServiceImpl<ICaseTabulationMapper
     }
 
 
+    @Override
+    public CaseTabulation info(String tabulationId,String pageType) {
+        CaseTabulation caseTabulation = this.getById(tabulationId);
+        if(caseTabulation == null){
+            throw new BusinessException(ResultCode.RECORD_NOT_EXIST);
+        }
+        if(caseTabulation.getOverviewId() != null){
+            CaseOverview caseOverview = caseOverviewService.getById(caseTabulation.getOverviewId());
+            caseOverviewService.checkLoginUser(caseOverview,null,pageType);
+        }else {
+            caseOverviewService.checkLoginUser(null,caseTabulation,pageType);
+        }
+        return caseTabulation;
+    }
 }