Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/sys/controller/FxController.java

@@ -328,10 +328,10 @@ public class FxController  extends BaseController {
 		Merchant merchant=merchantService.getMerchantByPosCode(admin.getLoginName());
 		
 	 	Map<String, Object> params = new HashMap<String, Object>();
-        params.put("LIKE_unitName", request.getParameter("unitName")==null?"":request.getParameter("unitName"));
-        params.put("LIKE_posCode", request.getParameter("posCode")==null?"":request.getParameter("posCode"));
+        params.put("LIKE_unitName", request.getParameter("LIKE_unitName")==null?"":request.getParameter("LIKE_unitName"));
+        params.put("LIKE_posCode", request.getParameter("LIKE_posCode")==null?"":request.getParameter("LIKE_posCode"));
         
-        String orgCode=request.getParameter("orgCode")==null?"":request.getParameter("orgCode");
+        String orgCode=request.getParameter("LIKE_orgCode")==null?"":request.getParameter("LIKE_orgCode");
         if(StringUtils.isNotEmpty(orgCode)) {
         	params.put("LIKE_orgCode", orgCode);
         }else {

src/main/resources/templates/sys/fx/merchantAllList.html

@@ -129,13 +129,13 @@
 			
 			<li>
 			 <label>商户名称</label>
-			  <input name=orgCode type="hidden" class="scinput" th:value="${search.get('LIKE_orgCode')}"/>
-			  <input name="unitName" type="text" class="scinput" th:value="${search.get('LIKE_unitName')}"/>
+			  <input name=LIKE_orgCode type="hidden" class="scinput" th:value="${search.get('LIKE_orgCode')}"/>
+			  <input name="LIKE_unitName" type="text" class="scinput" th:value="${search.get('LIKE_unitName')}"/>
 		    </li>
 		    
 		    <li>
 			 <label>商户账号</label>
-			  <input name="posCode" type="text" class="scinput" th:value="${search.get('LIKE_posCode')}"/>
+			  <input name="LIKE_posCode" type="text" class="scinput" th:value="${search.get('LIKE_posCode')}"/>
 		    </li>
 			
 		<li>