@@ -991,6 +991,11 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
// 处理字段值
formData = handleFormDataForSave(formData, formDesignConfig, tableName, null);
+ for (Map.Entry<String, Object> entry : formData.entrySet()) {
+ if (entry.getValue().toString().isEmpty()) {
+ entry.setValue(null);
+ }
//此时的formData 已经是剔除了子表单数据了
entity.putAll(formData);
@@ -35,6 +35,9 @@
<if test="dto.semesterId != null">
and t3.id = #{dto.semesterId}
</if>
+ <if test="dto.milexamname != null and dto.milexamname != ''">
+ and t1.milexamname like concat('%', #{dto.milexamname}, '%')
+ </if>
<if test="dto.startDate != null and dto.endDate != null">
and t1.sdate between #{dto.startDate} and #{dto.endDate}