From 42b8820a163101e38ab82db7c172c6e6dba643c7 Mon Sep 17 00:00:00 2001
From: niujiyi <18272501226@163.com>
Date: Fri, 29 May 2026 09:57:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppComprehensiveAnalysisController.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
index dd079256..3b6e55c3 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppComprehensiveAnalysisController.java
@@ -1,9 +1,11 @@
 package com.zdxt.enforcementcode.controller.app.enforcement;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import com.zdxt.enforcementcode.common.util.StringUtils;
 import com.zdxt.enforcementcode.domain.bo.ComprehensiveAnalysisBo;
 import com.zdxt.enforcementcode.service.ComprehensiveAnalysisService;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.system.domain.vo.SysDeptVo;
@@ -32,9 +34,9 @@ public class AppComprehensiveAnalysisController extends BaseController {
 
     @GetMapping("/whole")
     @ResponseBody
-    public ComprehensiveAnalysisBo whole(ComprehensiveAnalysisBo comprehensiveAnalysis){
+    public R<ComprehensiveAnalysisBo> whole(ComprehensiveAnalysisBo comprehensiveAnalysis){
         if("user".equals(comprehensiveAnalysis.getSearchType())){
-            return comprehensiveAnalysisService.whole(comprehensiveAnalysis);
+            return R.ok(comprehensiveAnalysisService.whole(comprehensiveAnalysis));
         } else if ("bureauDept".equals(comprehensiveAnalysis.getSearchType())) {
             String deptId = LoginHelper.getDeptId();
             SysDeptVo sysDeptVo = sysDeptService.iterationDeptParentToBureau(deptId);
@@ -42,9 +44,9 @@ public class AppComprehensiveAnalysisController extends BaseController {
             if(StringUtils.isNotBlank(bureauDeptId)){
                 comprehensiveAnalysis.setUserId(null);
                 comprehensiveAnalysis.setBureauDeptId(bureauDeptId);
-                return comprehensiveAnalysisService.whole(comprehensiveAnalysis);
+                return R.ok(comprehensiveAnalysisService.whole(comprehensiveAnalysis));
             }
         }
-        return new ComprehensiveAnalysisBo();
+        return R.ok(new ComprehensiveAnalysisBo());
     }
 }