From 6411fc8240ab4a90295d394cd53dfa54a726b5ab Mon Sep 17 00:00:00 2001
From: lucky <srf428110@163.com>
Date: Fri, 7 Jan 2022 09:43:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../carbasics/service/AccountManageService.java      |  2 +-
 .../carbasics/service/QuestionnaireService.java      |  2 +-
 src/main/resources/mapper_dao/AreaDao.xml            | 12 ++++--------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java
index 4ad8bea..13306c4 100644
--- a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java
+++ b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java
@@ -88,7 +88,7 @@ public class AccountManageService implements IAccountManageService {
         boolean flag = true;
         //1.校验字段是否都填写
         Integer num = questionnaireDetailDao.countCodeNumber(detailId);
-        if (num < 23) {
+        if (num < 24) {
            flag = false;
         }
         String answer = questionnaireDetailDao.queryXGZL(detailId);
diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
index 09f55aa..5e4a171 100644
--- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
+++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java
@@ -187,7 +187,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         stringList.add("QXXWJ");
         List<CodeVo.Basic> qxxwj = codeDictionariesDao.query(stringList);
         log.info("QXXWJ数量:{}",qxxwj.size());
-        if (num < (qxxwj.size()-1)) {
+        if (num < qxxwj.size()) {
             throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE);
         }
         String answer = questionnaireDetailDao.queryXGZL(param.getDetailId());
diff --git a/src/main/resources/mapper_dao/AreaDao.xml b/src/main/resources/mapper_dao/AreaDao.xml
index 8a8e20b..73209d1 100644
--- a/src/main/resources/mapper_dao/AreaDao.xml
+++ b/src/main/resources/mapper_dao/AreaDao.xml
@@ -3,15 +3,11 @@
 <mapper namespace="com.ccsens.carbasics.persist.dao.AreaDao">
 
     <resultMap id="area" type="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
-        <id column="shengid" property="id"/>
-        <result column="sheng" property="name"/>
+        <id column="shiid" property="id"/>
+        <result column="shiName" property="name"/>
         <collection property="child" ofType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
-            <id column="shiid" property="id"/>
-            <result column="shiname" property="name"/>
-            <collection property="child" ofType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$AreaInfo">
-                <id column="quid" property="id"/>
-                <result column="quname" property="name"/>
-            </collection>
+            <id column="quid" property="id"/>
+            <result column="quName" property="name"/>
         </collection>
     </resultMap>