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

src/main/java/com/ssj/dao/weixin/user/dao/impl/UserQueryImpl.java

@@ -83,6 +83,10 @@ public class UserQueryImpl implements  UserQueryDao {
 			selSQL.append(" and   u.wx_name LIKE  CONCAT(CONCAT('%',?,'%')) ");
 			queryParams.add(searchParams.get("name"));
 		}
+		if (searchParams.get("mobile") != null && !searchParams.get("mobile").equals("")) {
+			selSQL.append(" and   u.mobile = ? ");
+			queryParams.add(searchParams.get("mobile"));
+		}
 		if (searchParams.get("subscribe") != null && !searchParams.get("subscribe").equals("")) {
 				selSQL.append(" and u.subscribe = ?  ");
 			queryParams.add(searchParams.get("subscribe"));

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

@@ -287,6 +287,7 @@ public class SysLibController extends BaseController {
 	    		@RequestParam(required = false, defaultValue = "1") int pageNo ) throws Exception {
 	    	Map<String, Object> params = new HashMap<String, Object>();
 	    	params.put("name", request.getParameter("name")==null?"":request.getParameter("name"));
+	    	params.put("mobile", request.getParameter("mobile")==null?"":request.getParameter("mobile"));
 	    	params.put("libId", request.getParameter("libId"));
 	    	params.put("type", request.getParameter("type"));
 	    	params.put("subscribe", request.getParameter("subscribe")==null?"":request.getParameter("subscribe"));

src/main/resources/templates/sys/lib/selectUserList.html

@@ -20,6 +20,10 @@
 			<label>昵称</label>
 			<input name="name" type="text" class="scinput" th:value="${search.get('name')} == null  ? '': ${search.get('name')}"/>
 		</li>
+		<li>
+			<label>手机号码</label>
+			<input name="mobile" type="text" class="scinput" th:value="${search.get('mobile')} == null  ? '': ${search.get('mobile')}"/>
+		</li>
 			
 			
 			<li>
@@ -49,6 +53,7 @@
 		        <th style="width: 50px;">序号</th>
 		        <th>昵称</th>
 		        <th>头像</th>
+		        <th>手机号码</th>
 		        <th>是否关注</th>
 		    </tr>
 		</thead>
@@ -61,6 +66,7 @@
 					<td  class="imgtd">
 							<img  th:if="${item.get('photo')}!=null" th:src="${imgUrl}+''+${item.get('photo')}" style="width: 50px;height: 50px;" />
 					</td>
+				<td th:text="${item.get('mobile')}" ></td>
 				<td th:text="${item.get('subscribe')} ? (${item.get('subscribe')} == 1 ? '已关注' :'未关注') :'未关注'" ></td>
 			</tr>
 		</tbody>