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

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

@@ -1107,9 +1107,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
         // 立案申请状态直接修改主表信息
         if (caseApplication.getCaseStatus() != null && caseApplication.getCaseStatus().equals(CaseApplicationConstants.CASE_APPLICATION)) {
             // 修改内置字段
+            caseApplicationMapper.updataCaseApplication(caseApplication);
             if(CollectionUtil.isNotEmpty(caseApplication.getColumnValues())) {
-                caseApplicationMapper.updataCaseApplication(caseApplication);
-            }else {
                 // 修改自定义字段
                 columnValueMapper.batchUpdate(caseApplication.getColumnValues());
             }

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

@@ -25,7 +25,6 @@
                 <if test="item.value != null and item.value != ''">
                     `VALUE` = #{item.value},
                 </if>
-                `id`=#{item.id}
             </set>
             where id=#{item.id};
         </foreach>