fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/DepartmentDTO.java

@@ -42,6 +42,8 @@ public class DepartmentDTO implements Serializable {
     private String storeCode;
     
     private Integer bindFlag;
+    
+    private String relatedCode;
 
     private static final long serialVersionUID = 1L;
 
@@ -196,6 +198,14 @@ public class DepartmentDTO implements Serializable {
 	public void setBindFlag(Integer bindFlag) {
 		this.bindFlag = bindFlag;
 	}
+
+	public String getRelatedCode() {
+		return relatedCode;
+	}
+
+	public void setRelatedCode(String relatedCode) {
+		this.relatedCode = relatedCode;
+	}
 	
 	
 

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

@@ -33,6 +33,8 @@ public class TabHaobanDepartment implements Serializable {
     private Integer sort;
     
     private String wxEnterpriseId;
+    
+    private String relatedCode;
 
     private static final long serialVersionUID = 1L;
 
@@ -155,6 +157,14 @@ public class TabHaobanDepartment implements Serializable {
 	public void setChainName(String chainName) {
 		this.chainName = chainName;
 	}
+
+	public String getRelatedCode() {
+		return relatedCode;
+	}
+
+	public void setRelatedCode(String relatedCode) {
+		this.relatedCode = relatedCode;
+	}
     
     
 }
\ No newline at end of file

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

@@ -6,6 +6,7 @@
     <result column="department_name" property="departmentName" jdbcType="VARCHAR" />
     <result column="parent_department_id" property="parentDepartmentId" jdbcType="VARCHAR" />
     <result column="related_id" property="relatedId" jdbcType="VARCHAR" />
+    <result column="related_code" property="relatedCode" jdbcType="VARCHAR" />
     <result column="chain_id" property="chainId" jdbcType="VARCHAR" />
     <result column="chain_name" property="chainName" jdbcType="VARCHAR" />
     <result column="is_store" property="isStore" jdbcType="INTEGER" />
@@ -19,7 +20,7 @@
     <result column="level" property="level" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    department_id, department_name, parent_department_id, related_id, chain_id, is_store, 
+    department_id, department_name, parent_department_id, related_id, related_code,chain_id, is_store, 
     status_flag, recycle_flag, create_time, update_time,wx_department_id,sort,level,wx_enterprise_id,chain_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -34,11 +35,11 @@
   </delete>
   <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanDepartment" >
     insert into tab_haoban_department (department_id, department_name, parent_department_id, 
-      related_id, chain_id, is_store, 
+      related_id,related_code, chain_id, is_store, 
       status_flag, recycle_flag, create_time, 
       update_time,wx_department_id,sort,level,wx_enterprise_id,chain_name)
     values (#{departmentId,jdbcType=VARCHAR}, #{departmentName,jdbcType=VARCHAR}, #{parentDepartmentId,jdbcType=VARCHAR}, 
-      #{relatedId,jdbcType=VARCHAR}, #{chainId,jdbcType=VARCHAR}, #{isStore,jdbcType=INTEGER}, 
+      #{relatedId,jdbcType=VARCHAR},#{relatedCode,jdbcType=VARCHAR}, #{chainId,jdbcType=VARCHAR}, #{isStore,jdbcType=INTEGER}, 
       #{statusFlag,jdbcType=INTEGER}, #{recycleFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP},#{wxDepartmentId},#{sort},#{level},#{wxEnterpriseId},#{chainName})
   </insert>
@@ -57,6 +58,9 @@
       <if test="relatedId != null" >
         related_id,
       </if>
+       <if test="relatedCode != null" >
+        related_code,
+      </if>
       <if test="chainId != null" >
         chain_id,
       </if>
@@ -101,6 +105,9 @@
       <if test="relatedId != null" >
         #{relatedId,jdbcType=VARCHAR},
       </if>
+       <if test="relatedCode != null" >
+        #{relatedCode,jdbcType=VARCHAR},
+      </if>
       <if test="chainId != null" >
         #{chainId,jdbcType=VARCHAR},
       </if>
@@ -145,6 +152,9 @@
       <if test="relatedId != null" >
         related_id = #{relatedId,jdbcType=VARCHAR},
       </if>
+       <if test="relatedCode != null" >
+        related_code = #{relatedCode,jdbcType=VARCHAR},
+      </if>
       <if test="chainId != null" >
         chain_id = #{chainId,jdbcType=VARCHAR},
       </if>
@@ -186,6 +196,7 @@
     set department_name = #{departmentName,jdbcType=VARCHAR},
       parent_department_id = #{parentDepartmentId,jdbcType=VARCHAR},
       related_id = #{relatedId,jdbcType=VARCHAR},
+      related_code = #{relatedCode,jdbcType=VARCHAR},
       chain_id = #{chainId,jdbcType=VARCHAR},
       chain_name = #{chainName,jdbcType=VARCHAR},
       wx_department_id = #{wxDepartmentId,jdbcType=VARCHAR},
@@ -245,7 +256,7 @@
     	and wx_enterprise_id = #{wxEnterpriseId}
     </if>
      <if test="keyword != null and keyword != ''">
-    	and department_name like CONCAT('%',#{keyword},'%')
+    	and (department_name like CONCAT('%',#{keyword},'%') or wx_department_id like CONCAT('%',#{keyword},'%') or related_code like CONCAT('%',#{keyword},'%'))
     </if>
     <if test="recycleFlag != null">
     	and recycle_flag = #{recycleFlag}

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

@@ -212,8 +212,13 @@ public class DepartmentContoller extends WebBaseController{
 				}
 				Integer type = departmentAddQO.getType();
 				Integer isStore = 0;
+				String storeCode = "";
 				if(type != null && type == 3){
 					isStore = 1;
+					StoreDTO store = storeService.getStore(departmentAddQO.getRelatedId());
+					if(store != null){
+						storeCode  = store.getStoreCode();
+					}
 				}
 				DepartmentDTO department = new DepartmentDTO();
 				department.setParentDepartmentId(parentId);
@@ -230,6 +235,7 @@ public class DepartmentContoller extends WebBaseController{
 				department.setSort(departmentAddQO.getSort());
 				department.setLevel(dto.getLevel() + 1);
 				department.setRelatedId(departmentAddQO.getRelatedId());
+				department.setStoreCode(storeCode);
 				HaobanResponse hr = departmentApiService.add(department);
 				if(hr.getErrorCode() != 1) {
 					continue;
@@ -386,8 +392,13 @@ public class DepartmentContoller extends WebBaseController{
 			for (DepartmentAddQO departmentAddQO : list) {
 				Integer type = departmentAddQO.getType();
 				Integer isStore = 0;
+				String storeCode = "";
 				if(type != null && type == 3){
 					isStore = 1;
+					StoreDTO store = storeService.getStore(departmentAddQO.getRelatedId());
+					if(store != null){
+						storeCode  = store.getStoreCode();
+					}
 				}
 				String sonParentId = "";
 				DepartmentDTO dto = departmentApiService.selectById(parentId);
@@ -416,6 +427,7 @@ public class DepartmentContoller extends WebBaseController{
 						department.setIsStore(isStore);
 					}
 					department.setRelatedId(departmentAddQO.getRelatedId());
+					department.setStoreCode(storeCode);
 					HaobanResponse hr = departmentApiService.add(department);
 					if(hr.getErrorCode() != 1) {
 						continue;