nsy update 添加根据磁贴类型搜索磁贴

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -40,7 +40,10 @@
                 AND m.visible = #{visible}
             </if>
             <if test="magnetSize != null and magnetSize != ''">
-                AND m.magnetSize = #{magnet_size}
+                AND m.magnet_size = #{magnetSize}
+            </if>
+            <if test="magnetType != null and magnetType != ''">
+                AND m.magnet_type = #{magnetType}
             </if>
             ${params.dataScope}
         </where>

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/add.html

@@ -82,7 +82,7 @@
 	<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="div1">
 		<form class="form-horizontal m" id="form-magnet-add">
 			<div class="form-group">
-				<label class="col-sm-3 control-label"><span style="color: red; ">*</span>磁贴应用类型：</label>
+				<label class="col-sm-3 control-label"><span style="color: red; ">*</span>磁贴类型：</label>
 				<div class="col-sm-8">
 					<select name="magnetType" id="sel_magnetType" class="form-control m-b"
 							th:with="type=${@dict.getType('sys_magnet_type')}"

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/edit.html

@@ -84,7 +84,7 @@
             <input type="hidden" name="magnetId" th:field="*{magnetId}">
 
             <div class="form-group">
-                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>磁贴应用类型：</label>
+                <label class="col-sm-3 control-label"><span style="color: red; ">*</span>磁贴类型：</label>
                 <div class="col-sm-8">
                     <select name="magnetType" id="sel_magnetType" class="form-control m-b"
                             th:with="type=${@dict.getType('sys_magnet_type')}"

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/wxMagnet.html

@@ -36,6 +36,12 @@
 									<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 								</select>
 							</li>
+							<li>
+								磁贴类型：<select name="magnetType" th:with="type=${@dict.getType('sys_magnet_type')}">
+								<option value="">所有</option>
+								<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+							</select>
+							</li>
 							<li>
 								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -117,7 +123,7 @@
 		            align: "left"
 		        },
 				{
-					title: '磁贴应用类型',
+					title: '磁贴类型',
 					field: 'magnetType',
 					width: '10%',
 					align: "left",