From 1679f1065d8d77f552e443de649bb4d9d609aee2 Mon Sep 17 00:00:00 2001
From: zhaoxinyu <zhaoxinyu0716@gmail.com>
Date: Mon, 2 Sep 2024 15:26:15 +0800
Subject: [PATCH] commit

---
 .../service/impl/QuestionAnswerRankingServiceImpl.java    | 4 ++++
 .../resources/views/platform/caredata/UnionCareData.html  | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java b/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java
index a1528d2..e0efab6 100644
--- a/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java
+++ b/src/main/java/io/v/nutz/question/service/impl/QuestionAnswerRankingServiceImpl.java
@@ -19,6 +19,7 @@ import org.nutz.dao.Sqls;
 import org.nutz.dao.sql.Sql;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 
 import java.io.IOException;
@@ -38,6 +39,9 @@ public class QuestionAnswerRankingServiceImpl extends BaseServiceImpl<QuestionUs
     @Override
     public Pagination pageData(PageForm pageForm, String questionId, String unionId, String unitId, String answerDate) {
         Question question = dao().fetch(Question.class, questionId);
+        if (Lang.isEmpty(question)) {
+            return new Pagination();
+        }
 
         if (question.getCtMode() == 1) {
             Sql sql = Sqls.create("""
diff --git a/src/main/resources/views/platform/caredata/UnionCareData.html b/src/main/resources/views/platform/caredata/UnionCareData.html
index 76c9792..5b5e6ed 100644
--- a/src/main/resources/views/platform/caredata/UnionCareData.html
+++ b/src/main/resources/views/platform/caredata/UnionCareData.html
@@ -249,7 +249,7 @@ layout("/layouts/platform.html"){
 
     </el-row>
 
-    <el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
+  <!--  <el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
         <el-col :span="24" style="padding: 0 20px"
                 v-loading="knbfnum_loading">
             <div class="chartTitle" style="margin-bottom: 50px">困难帮扶申请趋势</div>
@@ -286,9 +286,9 @@ layout("/layouts/platform.html"){
             <div class="chartTitle" style="margin-bottom: 50px">教职工子女入学登记申请趋势</div>
             <div id="rxnumChart" style="width: 100%;height: 300px;"></div>
         </el-col>
-    </el-row>
+    </el-row>-->
 
-    <el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
+    <!--<el-row style="padding: 30px 0;border-bottom: 10px solid rgb(240, 240, 240)">
         <div style="position: absolute;top: 25px;right: 40px">
             <el-date-picker
                     class="year"
@@ -359,7 +359,7 @@ layout("/layouts/platform.html"){
         <el-row v-if="stNone" class="none-data">
             <span class="none-data-title">暂无社团</span>
         </el-row>
-    </el-row>
+    </el-row>-->
 
 </div>