部门搜索

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java

@@ -181,7 +181,7 @@ public interface DepartmentApiService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	List<DepartmentDTO> searchDepartment(String search, String wxEnterpriseId);
+	List<DepartmentShortDTO> searchDepartment(String search, String wxEnterpriseId);
 
 	/**
 	 * 获取所有部门

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/DepartmentMapper.java

@@ -80,5 +80,12 @@ public interface DepartmentMapper {
 	 */
 	public List<TabHaobanDepartment> listAllDepartment(String wxEnterpriseId);
 
+	/**
+	 * 查询所有部门
+	 * @param wxEnterpriseId
+	 * @return
+	 */
+	public List<TabHaobanDepartment> searchDepartment(String search,String wxEnterpriseId);
+
 
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/DepartmentService.java

@@ -79,7 +79,7 @@ public interface DepartmentService {
 	 * @param wxEnterpriseId
 	 * @return
 	 */
-	List<DepartmentDTO> searchDepartment(String search,String wxEnterpriseId);
+	List<DepartmentShortDTO> searchDepartment(String search,String wxEnterpriseId);
 
 	/**
 	 * 获取搜友部门

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/DepartmentServiceImpl.java

@@ -209,8 +209,8 @@ public class DepartmentServiceImpl implements DepartmentService {
 	}
 
 	@Override
-	public List<DepartmentDTO> searchDepartment(String search, String wxEnterpriseId) {
-		return null;
+	public List<DepartmentShortDTO> searchDepartment(String search, String wxEnterpriseId) {
+		return EntityUtil.changeEntityListByJSON(DepartmentShortDTO.class, mapper.searchDepartment(search,wxEnterpriseId));
 	}
 
 	@Override

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java

@@ -790,8 +790,8 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 	}
 
 	@Override
-	public List<DepartmentDTO> searchDepartment(String search, String wxEnterpriseId) {
-		return null;
+	public List<DepartmentShortDTO> searchDepartment(String search, String wxEnterpriseId) {
+		return departmentService.searchDepartment(search,wxEnterpriseId);
 	}
 
 	@Override

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -535,4 +535,12 @@
     from tab_haoban_department
     where  wx_enterprise_id = #{wxEnterpriseId} and status_flag = 1
   </select>
+
+  <select id="searchDepartment" resultMap="BaseResultMap"  >
+    select
+    <include refid="Base_Column_List_short" />
+    from tab_haoban_department
+    where  wx_enterprise_id = #{wxEnterpriseId} and status_flag = 1
+    and department_name likelike CONCAT('%',#{search},'%')
+  </select>
 </mapper>
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -842,7 +842,7 @@ public class DepartmentContoller extends WebBaseController{
 		if (StringUtils.isBlank(wxEnterpriseId)) {
 			return resultResponse(HaoBanErrCode.ERR_6);
 		}
-		List<DepartmentDTO> list = departmentApiService.searchDepartment(search, wxEnterpriseId);
+		List<DepartmentShortDTO> list = departmentApiService.searchDepartment(search, wxEnterpriseId);
 		return resultResponse(HaoBanErrCode.ERR_1,list);
 
 	}