Merge branch 'wq' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseApplication.java

@@ -558,12 +558,7 @@ public class CaseApplication  extends BaseEntity {
     /** 姓名 */
     @Excel(name = "申请人主体信息-申请人(机构)",width = 26)
     private String name;
-    /** 申请人主体信息-法定代表人 */
-    @Excel(name = "申请人主体信息-法定代表人",width = 26)
-    private String compLegalPerson;
-    /** 申请人主体信息-法定代表人 */
-    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
-    private String compLegalperPost;
+
     /**
      * 申请人主体信息-申请人(机构)id
      */
@@ -578,15 +573,22 @@ public class CaseApplication  extends BaseEntity {
     /** 联系地址 */
     @Excel(name = "申请人主体信息-联系地址",width = 26)
     private String contactAddress;
-    /** 申请人住所 */
-    @Excel(name = "申请人主体信息-住所",width = 26)
-    private String residenAffiliAppli;
     /** 单位电话 */
     @Excel(name = "申请人主体信息-单位电话",width = 26)
     private String workTelphone;
     /** 单位地址 */
     @Excel(name = "申请人主体信息-单位地址",width = 26)
     private String workAddress;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人",width = 26)
+    private String compLegalPerson;
+    /** 申请人主体信息-法定代表人 */
+    @Excel(name = "申请人主体信息-法定代表人职位",width = 26)
+    private String compLegalperPost;
+    /** 申请人住所 */
+    @Excel(name = "申请人主体信息-住所",width = 26)
+    private String residenAffiliAppli;
+
 
     /** 代理人姓名 */
     @Excel(name = "申请人主体信息-代理人姓名",width = 26)

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java

@@ -1306,6 +1306,16 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         }else if(caseApplication.getDebtorWorkAddress().length()>50){
             failureMsg.append("【被申请人主体信息-单位地址】字段超出指定长度，最大长度为50；");
         }
+        if( StrUtil.isEmpty(caseApplication.getResponSex())){
+            failureMsg.append("【被申请人主体信息-性别】字段不能为空；");
+        }else if(caseApplication.getResponSex().length()>1){
+            failureMsg.append("【被申请人主体信息-性别】字段超出指定长度，最大长度为1；");
+        }
+        if( caseApplication.getResponBirth()== null){
+            failureMsg.append("【被申请人主体信息-出生年月日】字段不合法；");
+        }else if(caseApplication.getResponBirth().after(new Date())){
+            failureMsg.append("【被申请人主体信息-出生年月日】字段不合法,不能超过当前日期；");
+        }
     }
 
     /**

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/IdentityAuthenticationMapper.xml

@@ -54,6 +54,7 @@
         SELECT  i.id ,i.name ,i.identity_no ,i.certification_time ,i.certification_status ,i.user_id ,i.user_name
         from identi_authenti i
         <where>
+            certification_status=0
             <if test="userName != null  and userName != '' ">
                 AND i.user_name  = #{userName}
             </if>
@@ -64,6 +65,7 @@
                 AND i.identity_no  = #{identityNo}
             </if>
         </where>
+        limit 1
     </select>
 
     <select id="selectCountIdentityAuthentication" resultType="Integer">