Commit 3a64b38a by 罗绍泽

修改

parent 69984822
...@@ -181,8 +181,7 @@ function updateData(is_entity){ ...@@ -181,8 +181,7 @@ function updateData(is_entity){
var ue=UE.getEditor('ueditId'); var ue=UE.getEditor('ueditId');
is_entity.FIELD_MODEL_CONTENT=ue.getContent(); is_entity.FIELD_MODEL_CONTENT=ue.getContent();
console.log(is_entity); delete is_entity.FIELD_ueditValue;
return;
v_result = formmodelModule.act.updateFormModel(is_entity); v_result = formmodelModule.act.updateFormModel(is_entity);
$('#list').datagrid('reload'); $('#list').datagrid('reload');
return v_result; return v_result;
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<if test="IS_SHOW_LIST != null and IS_SHOW_LIST != ''"> <if test="IS_SHOW_LIST != null and IS_SHOW_LIST != ''">
and f.IS_SHOW_LIST = #{IS_SHOW_LIST} and f.IS_SHOW_LIST = #{IS_SHOW_LIST}
</if> </if>
<if test="DELETE_FLAG != null and DELETE_FLAG != ''">
and f.DELETE_FLAG = #{DELETE_FLAG}
</if>
</trim> </trim>
</sql> </sql>
<insert id="insert_form_field" parameterType="map"> <insert id="insert_form_field" parameterType="map">
...@@ -68,7 +71,7 @@ ...@@ -68,7 +71,7 @@
<select id="list_form_field" parameterType="map" resultType="upperCaseKeyMap"> <select id="list_form_field" parameterType="map" resultType="upperCaseKeyMap">
<![CDATA[ <![CDATA[
select f.* select f.*
from C_T_FORM_FIELD f where DELETE_FLAG=0 from C_T_FORM_FIELD f
]]> ]]>
<include refid="Where_Clause" /> <include refid="Where_Clause" />
order by f.CREATE_TIME DESC order by f.CREATE_TIME DESC
......
...@@ -87,6 +87,8 @@ public class FormtableBusinessImpl implements FormtableBusiness { ...@@ -87,6 +87,8 @@ public class FormtableBusinessImpl implements FormtableBusiness {
if(query.get("TABLE_NAME")!=null&&""!=query.get("TABLE_NAME")){ if(query.get("TABLE_NAME")!=null&&""!=query.get("TABLE_NAME")){
query.put("TABLE_NAME", "%"+query.get("TABLE_NAME")+"%"); query.put("TABLE_NAME", "%"+query.get("TABLE_NAME")+"%");
} }
//默认选择逻辑删,未删除的
query.put("DELETE_FLAG", 0);
// 获取列表 // 获取列表
List<Map<String, Object>> items = formtableDAO.list_form_table(new RowBounds(pageStart, pageSize), query); List<Map<String, Object>> items = formtableDAO.list_form_table(new RowBounds(pageStart, pageSize), query);
// 获取列表个数 // 获取列表个数
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<mapper namespace="com.gaowj.business.formtable.formtableDAO"> <mapper namespace="com.gaowj.business.formtable.formtableDAO">
<sql id="Where_Clause"> <sql id="Where_Clause">
<trim prefix="WHERE" prefixOverrides="AND |OR"> <trim prefix="WHERE" prefixOverrides="AND |OR">
and f.DELETE_FLAG=0 <if test="DELETE_FLAG != null and DELETE_FLAG != ''">
and f.DELETE_FLAG=#{DELETE_FLAG}
</if>
<if test="UUID != null and UUID != ''"> <if test="UUID != null and UUID != ''">
and f.UUID = #{UUID} and f.UUID = #{UUID}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment