Showing
4 changed files
with
4 additions
and
5 deletions
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | and word_type = #{wordType} | 22 | and word_type = #{wordType} |
23 | </if> | 23 | </if> |
24 | <if test="clientType != null"> | 24 | <if test="clientType != null"> |
25 | - and client_type = #{clientType} | 25 | + and (client_type = #{clientType} or client_type = 2) |
26 | </if> | 26 | </if> |
27 | </sql> | 27 | </sql> |
28 | <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > | 28 | <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" > |
@@ -12,7 +12,7 @@ redis.readonly.proxy.port=6379 | @@ -12,7 +12,7 @@ redis.readonly.proxy.port=6379 | ||
12 | redis.readonly.proxy.auth= | 12 | redis.readonly.proxy.auth= |
13 | 13 | ||
14 | 14 | ||
15 | -erp.domain=http://192.168.102.47:9098/erp-gateway-web | 15 | +erp.domain=http://192.168.102.47:9098 |
16 | 16 | ||
17 | 17 | ||
18 | # ******************** message ******************** | 18 | # ******************** message ******************** |
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | <td> | 9 | <td> |
10 | <select id="wordType" class="easyui-combobox" name="wordType" | 10 | <select id="wordType" class="easyui-combobox" name="wordType" |
11 | style="margin-left: 10px;width: 200px "> | 11 | style="margin-left: 10px;width: 200px "> |
12 | - <option value="0" selected="selected">热搜词</option> | 12 | + <option value="0">热搜词</option> |
13 | <option value="1">默认搜索词</option> | 13 | <option value="1">默认搜索词</option> |
14 | </select> | 14 | </select> |
15 | </td> | 15 | </td> |
@@ -67,7 +67,7 @@ | @@ -67,7 +67,7 @@ | ||
67 | $("#orderByTR").show(); | 67 | $("#orderByTR").show(); |
68 | }else { | 68 | }else { |
69 | $("#orderByTR").hide(); | 69 | $("#orderByTR").hide(); |
70 | - $('#orderBy').combobox('clear'); | 70 | + $('#orderBy').attr("value" , ""); |
71 | } | 71 | } |
72 | } | 72 | } |
73 | } | 73 | } |
@@ -33,7 +33,6 @@ | @@ -33,7 +33,6 @@ | ||
33 | <option value="">选择展示平台</option> | 33 | <option value="">选择展示平台</option> |
34 | <option value="0">APP</option> | 34 | <option value="0">APP</option> |
35 | <option value="1">小程序</option> | 35 | <option value="1">小程序</option> |
36 | - <option value="2">小程序、APP</option> | ||
37 | </select> | 36 | </select> |
38 | <select id="wordType" class="easyui-combobox" style="width:150px;" > | 37 | <select id="wordType" class="easyui-combobox" style="width:150px;" > |
39 | <option value="">选择搜索词类型</option> | 38 | <option value="">选择搜索词类型</option> |
-
Please register or login to post a comment