解决代码冲突

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -363,7 +363,7 @@ public class EVDataServiceImpl implements EVDataService {
                     updateSql = "update u_contract_log set e_visa_pdf_url='" + taskApp.getLastFilePdfUrl() + "',status='" + taskApp.getSigType() + "',update_time=SYSDATE() where id='" + taskApp.getFormDataId() + "' ";
                 } else if (taskApp.getApprovalType() == 5) { //中期计量支付证书
                     // 获取s_interim_pay_certificate 的原始数据
-                    taskApp.getPagePdfUrl()
+                    taskApp.getPagePdfUrl();
 
 
                     updateSql = "update s_interim_pay_certificate set approve_status=" + taskApp.getSigType() + ",update_time=SYSDATE(), raw_url='" + taskApp.getLastFilePdfUrl() + "' where contract_period_id = " + taskApp.getFormDataId();

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -229,6 +229,7 @@
                             AND iq.chek_status = #{query.chekStatus}
                         </otherwise>
                     </choose>
+                </if>
                 <if test="query.chekStatus != null">
                     AND iq.chek_status = #{query.chekStatus}
                 </if>