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

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

@@ -1316,7 +1316,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                                 if(caseAffiliate.getIdentityType()==1){
                                     // 校验申请人
                                     for (String applicAffiliateColumn : applicAffiliateColumns) {
-                                        if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseApplication, applicAffiliateColumn))){
+                                        if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){
                                             errorMsg.append(applicAffiliateColumn).append("不能为空，");
                                             // todo 暂抛出异常，后边改为提示具体的字段
                                             throw new ServiceException("必填字段未填写，请完善案件信息！");
@@ -1326,7 +1326,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                                     // 校验被申请人
                                     // 校验申请人
                                     for (String applicAffiliateColumn : dectborAffiliateColumns) {
-                                        if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseApplication, applicAffiliateColumn))){
+                                        if(StrUtil.isEmpty( ObjectFieldUtils.getValue(caseAffiliate, applicAffiliateColumn))){
                                             errorMsg.append(applicAffiliateColumn).append("不能为空，");
                                             // todo 暂抛出异常，后边改为提示具体的字段
                                             throw new ServiceException("必填字段未填写，请完善案件信息！");

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

@@ -1535,7 +1535,7 @@
         order by c.create_time desc limit 1
     </select>
     <select id="listCaseApplicationByIds" resultMap="CaseApplicationResult">
-        select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,
+        select c.id ,c.case_num ,c.case_subject_amount ,c.register_date ,c.arbitrat_method ,c.case_name,
         CASE c.arbitrat_method when 1 then '开庭审理' when 2 then '书面审理'
         ELSE '无审理方式'
         END arbitratMethodName,