anderx 4 年之前
父節點
當前提交
aad169f642

+ 4 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -2298,7 +2298,10 @@ inner join(
 	left join `role` r on r.id=ur.rid 
 	left join `role` r on r.id=ur.rid 
 	where r.role_type=80
 	where r.role_type=80
   </select>
   </select>
-  
+  <select id="getUserByName" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
+  	select id,nickname name from `user` where nickname like concat('%',#{name},'%')
+  </select>
+  	
   <select id="getUserByNameList" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
   <select id="getUserByNameList" parameterType="java.lang.String" resultType="com.goafanti.customer.bo.CustomerSimpleBo">
   	select id,nickname name from `user` where nickname like concat('%',#{name},'%')
   	select id,nickname name from `user` where nickname like concat('%',#{name},'%')
   	<if test="page_sql != null">
   	<if test="page_sql != null">

+ 14 - 1
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -253,6 +253,19 @@ public class AdminCustomerApiController extends BaseApiController{
 	
 	
 	/** 客户查询 **/
 	/** 客户查询 **/
 	@RequestMapping(value = "/getUserByName",method = RequestMethod.GET)
 	@RequestMapping(value = "/getUserByName",method = RequestMethod.GET)
+	public Result getUserByName(String name){
+		Result res = new Result();
+		if(StringUtils.isEmpty(name)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "名称","名称"));
+			return res;
+		}
+		if(name.length()<2) return res;
+		res.data(customerService.getUserByName(name));
+		return res;
+	}
+	
+	/** 客户查询 **/
+	@RequestMapping(value = "/getUserByNames",method = RequestMethod.GET)
 	public Result getUserByName(String name,Integer pageNo,Integer pageSize){
 	public Result getUserByName(String name,Integer pageNo,Integer pageSize){
 		Result res = new Result();
 		Result res = new Result();
 		if(StringUtils.isEmpty(name)){
 		if(StringUtils.isEmpty(name)){
@@ -260,7 +273,7 @@ public class AdminCustomerApiController extends BaseApiController{
 			return res;
 			return res;
 		}
 		}
 		if(name.length()<2) return res;
 		if(name.length()<2) return res;
-		res.data(customerService.getUserByName(name,pageNo,pageSize));
+		res.data(customerService.getUserByNames(name,pageNo,pageSize));
 		return res;
 		return res;
 	}
 	}
 	
 	

+ 2 - 3
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -130,11 +130,9 @@ public interface CustomerService {
 	/**
 	/**
 	 * 客户全查询
 	 * 客户全查询
 	 * @param name
 	 * @param name
-	 * @param pageSize 
-	 * @param pageNo 
 	 * @return
 	 * @return
 	 */
 	 */
-	Object getUserByName(String name, Integer pageNo, Integer pageSize);
+	Object getUserByName(String name);
 	
 	
 	/**
 	/**
 	 * 判断是否存在某个单位客户
 	 * 判断是否存在某个单位客户
@@ -571,4 +569,5 @@ public interface CustomerService {
 	int updateUserName(String uid, String userName);
 	int updateUserName(String uid, String userName);
 	List<UserNamesListBo> listUserName(String uid);
 	List<UserNamesListBo> listUserName(String uid);
 	boolean checkUserName(String userName);
 	boolean checkUserName(String userName);
+	Object getUserByNames(String name, Integer pageNo, Integer pageSize);
 }
 }

+ 10 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2208,9 +2208,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return findPage("selectChannelCountsList", "selectChannelCountsCount", params, in.getPageNo(),
 		return findPage("selectChannelCountsList", "selectChannelCountsCount", params, in.getPageNo(),
 				in.getPageSize());
 				in.getPageSize());
 	}
 	}
+	
+	@Override
+	public Object getUserByName(String name) {
+		return userMapper.getUserByName(name);
+	}
 
 
 	@Override
 	@Override
-	public Object getUserByName(String name, Integer pageNo, Integer pageSize) {
+	public Object getUserByNames(String name, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		Map<String, Object> params = new HashMap<>();
 		params.put("name", name);
 		params.put("name", name);
 		return  findPage("getUserByNameList", "getUserByNameCount", params, pageNo,pageSize);
 		return  findPage("getUserByNameList", "getUserByNameCount", params, pageNo,pageSize);
@@ -2244,6 +2249,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return list;
 		return list;
 	}
 	}
 
 
+
+
+	
+
 	
 	
 
 
 }
 }