Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

 package com.gic.haoban.manage.web.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import cn.hutool.core.collection.CollectionUtil;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.dto.ClerkListDTO;
@@ -31,7 +10,6 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.GicTreeDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
-import com.gic.enterprise.api.dto.StoreGroupDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
@@ -39,16 +17,16 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.Constant;
 import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.base.api.common.ServiceResponse;
-import com.gic.haoban.manage.web.anno.IgnoreLogin;
-import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
+import com.gic.haoban.manage.api.dto.DepartmentShortDTO;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
+import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.DepartmentAddQO;
 import com.gic.haoban.manage.web.qo.DepartmentEditQO;
@@ -57,11 +35,17 @@ import com.gic.haoban.manage.web.thread.SyncDepartmentThread;
 import com.gic.haoban.manage.web.vo.DepartmentChainVO;
 import com.gic.haoban.manage.web.vo.DepartmentVO;
 import com.gic.haoban.manage.web.vo.LoginVO;
-import com.gic.haoban.manage.web.vo.StoreVo;
-import com.gic.haoban.operation.api.args.SaveOrUpdateEnterpriseAuthenticationArgs;
 import com.gic.redis.data.util.RedisUtil;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
-import okhttp3.internal.http2.ErrorCode;
+import java.util.*;
 
 @RestController
 public class DepartmentContoller extends WebBaseController{
@@ -850,6 +834,19 @@ public class DepartmentContoller extends WebBaseController{
 
 	}
 
+
+	@RequestMapping("department-search")
+	public HaobanResponse departmentSearch(String search) {
+		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
+		String wxEnterpriseId = login.getWxEnterpriseId();
+		if (StringUtils.isBlank(wxEnterpriseId)) {
+			return resultResponse(HaoBanErrCode.ERR_6);
+		}
+		List<DepartmentShortDTO> list = departmentApiService.searchDepartment(search, wxEnterpriseId);
+		return resultResponse(HaoBanErrCode.ERR_1,list);
+
+	}
+
 	/**
 	 * 加载
 	 * @return