From 50e1eb020efe8da670b718d865fa4c1eaa61ee7d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 19:51:09 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
index 2c98fd4..e82ea64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActQuestnaireServiceImpl.java
@@ -90,11 +90,9 @@
                         subSelectionDO.setQueSubId(comActQuestnaireSubDO.getId());
                         if(subSelect.getType()==1){
                             //添加选项名称
-                        }
-                        if(subSelect.getOptionName()!=null) {
                             subSelectionDO.setOptionName(subSelect.getOptionName());
-                        }else{
-                            subSelectionDO.setOptionName(String.valueOf(i));
+                        }else {
+                            subSelectionDO.setOptionName(String.valueOf(Character.toChars('A' + i)));
                         }
                         subSelectionDO.setSort(subSelect.getSort());
                         subSelectionDO.setContent(subSelect.getContent());
@@ -352,6 +350,12 @@
 
     @Override
     public R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO) {
+        if(pageQuestnaireAnswerDTO.getPageNum()==null||pageQuestnaireAnswerDTO.getPageNum().longValue()==0){
+            pageQuestnaireAnswerDTO.setPageNum(1l);
+        }
+        if(pageQuestnaireAnswerDTO.getPageSize()==null||pageQuestnaireAnswerDTO.getPageSize().longValue()==0){
+            pageQuestnaireAnswerDTO.setPageSize(10l);
+        }
         Page userPage = new Page(pageQuestnaireAnswerDTO.getPageNum(), pageQuestnaireAnswerDTO.getPageSize());
         IPage<ComActQuestnaireAnswerContentVO> doPager = questnaireAnswerContentDAO.selectAnswersByPage(userPage, pageQuestnaireAnswerDTO);
         return R.ok(doPager);

--
Gitblit v1.7.1