|
@@ -36,7 +36,10 @@
|
|
|
|
|
|
<!-- 通用查询结果列 -->
|
|
<!-- 通用查询结果列 -->
|
|
<sql id="Base_Column_List">
|
|
<sql id="Base_Column_List">
|
|
- d.category,
|
|
|
|
|
|
+ d
|
|
|
|
+ .
|
|
|
|
+ category
|
|
|
|
+ ,
|
|
d.create_by,
|
|
d.create_by,
|
|
d.create_time,
|
|
d.create_time,
|
|
d.fetch_logic,
|
|
d.fetch_logic,
|
|
@@ -72,7 +75,7 @@
|
|
from field_define
|
|
from field_define
|
|
where category = #{cat}
|
|
where category = #{cat}
|
|
and is_deleted = 0
|
|
and is_deleted = 0
|
|
- order by create_time desc,id desc
|
|
|
|
|
|
+ order by create_time desc, id desc
|
|
|
|
|
|
|
|
|
|
</select>
|
|
</select>
|
|
@@ -82,7 +85,7 @@
|
|
from field_define
|
|
from field_define
|
|
WHERE name_zh LIKE concat('%', #{info}, '%')
|
|
WHERE name_zh LIKE concat('%', #{info}, '%')
|
|
and is_deleted = 0
|
|
and is_deleted = 0
|
|
- order by create_time desc,id desc
|
|
|
|
|
|
+ order by create_time desc, id desc
|
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
@@ -91,7 +94,7 @@
|
|
from field_define
|
|
from field_define
|
|
WHERE name_zh LIKE concat('%', #{info}, '%')
|
|
WHERE name_zh LIKE concat('%', #{info}, '%')
|
|
and is_deleted = 0
|
|
and is_deleted = 0
|
|
- order by create_time desc,id desc
|
|
|
|
|
|
+ order by create_time desc, id desc
|
|
|
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
@@ -107,7 +110,7 @@
|
|
from field_define d
|
|
from field_define d
|
|
LEFT JOIN product_field_ref r on d.field_no = r.field_no
|
|
LEFT JOIN product_field_ref r on d.field_no = r.field_no
|
|
where r.product_num = #{productNum}
|
|
where r.product_num = #{productNum}
|
|
- <if test="oneLevel!=null">
|
|
|
|
|
|
+ <if test="oneLevel!=null and oneLevel!=''">
|
|
and d.one_level = #{oneLevel}
|
|
and d.one_level = #{oneLevel}
|
|
</if>
|
|
</if>
|
|
<if test="category!=null">
|
|
<if test="category!=null">
|