Browse Source

营销员查询修改

anderx 3 years ago
parent
commit
cb6639fa55

+ 2 - 2
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -64,7 +64,7 @@ public interface AdminService {
 
 	Map<String, String> listAdminSelect();
 
-	List<Admin> listAdminByName(String name);
+	List<Admin> listAdminByName(String name,Integer satus);
 
 	List<AdminListBo> selectDepartmentStaff(String departmentId,String name);
 
@@ -89,5 +89,5 @@ public interface AdminService {
 	depCountBo selectAllUser(String depId, String startTime, String endTime, String aName);
 
 
-	
+
 }

+ 2 - 2
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -234,8 +234,8 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	}
 
 	@Override
-	public List<Admin> listAdminByName(String name) {
-		return adminMapper.listAdminByName(name);
+	public List<Admin> listAdminByName(String name,Integer status) {
+		return adminMapper.listAdminByName(name,status);
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -248,7 +248,7 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	@Override
 	public List<Admin> listAdminByName(String name) {
 
-		return adminMapper.listAdminByName(name);
+		return adminMapper.listAdminByName(name,0);
 	}
 
 	@Override

+ 1 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -56,7 +56,7 @@ public interface AdminMapper {
 
     List<Admin> listAdminSelectByAreaAdmin(@Param("provinceList")List<Integer> provinceList, @Param("cityList")List<Integer> cityList);
 
-    List<Admin> listAdminByName(@Param("name")String name);
+    List<Admin> listAdminByName(@Param("name")String name,@Param("status")Integer status);
 
 
     int insertn(Admin record);

+ 7 - 1
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -506,7 +506,13 @@
 
 
   <select id="listAdminByName" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select id,name from admin where status='正常'  and name like concat('%',#{name},'%')
+    select id,name from admin where   name like concat('%',#{name},'%')
+    <if test="status==0">
+      and status= '正常'
+    </if>
+    <if test="status==1">
+      and status= '锁定'
+    </if>
   </select>
 
   <!--*************************************************************************-->

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

@@ -874,9 +874,9 @@ public class AdminCustomerApiController extends BaseApiController{
 
 	/** 管理员列表 **/
 	@RequestMapping(value = "/listAdminByName",method = RequestMethod.GET)
-	public Result listAdminByName(String adminName){
+	public Result listAdminByName(String adminName,Integer status){
 		Result res = new Result();
-		if(StringUtils.isNotBlank(adminName))res.setData(adminService.listAdminByName(adminName));
+		if(StringUtils.isNotBlank(adminName))res.setData(adminService.listAdminByName(adminName,status));
 		return res;
 	}