加日志

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

@@ -27,7 +27,7 @@ public interface DepartmentMapper {
 
 	TabHaobanDepartment selectByRelatedId(@Param("relatedId")String relatedId);
 
-	TabHaobanDepartment getByWxId(@Param("wxDepartmentId")String wxDepartmentId);
+	List<TabHaobanDepartment> getByWxId(@Param("wxDepartmentId")String wxDepartmentId, @Param("wxEnterpriseId") String wxEnterpriseId);
 	
 	List<TabHaobanDepartment> listByDepartmentIds(@Param("departmentIds")List<String> departmentIds,@Param("storeFlag")int storeFlag);
 	

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

@@ -20,7 +20,7 @@ public interface DepartmentService {
 
 	TabHaobanDepartment selectByRelatedId(String relatedId);
 
-	TabHaobanDepartment getByWxId(String wxDepartmentId);
+	TabHaobanDepartment getByWxId(String wxDepartmentId, String wxEnterpriseId);
 
 	void recycle(String departmentId);
 

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

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -73,12 +74,15 @@ public class DepartmentServiceImpl implements DepartmentService {
 
 	@Override
 	public TabHaobanDepartment selectByRelatedId(String relatedId) {
-		
 		return mapper.selectByRelatedId(relatedId);
 	}
 
 	@Override
-	public TabHaobanDepartment getByWxId(String wxDepartmentId) {
+	public TabHaobanDepartment getByWxId(String wxDepartmentId, String wxEnterpriseId) {
+		List<TabHaobanDepartment> list = this.mapper.getByWxId(wxDepartmentId, wxEnterpriseId);
+		if(CollectionUtils.isNotEmpty(list)){
+			return list.get(0);
+		}
 		return null;
 	}
 

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

@@ -331,7 +331,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		String chainId = "0";
 		String chainName = "0";
 		if(parentId != 1){
-			TabHaobanDepartment parent = this.departmentService.getByWxId(parentId + "");
+			TabHaobanDepartment parent = this.departmentService.getByWxId(parentId + "", wxEnterpriseId);
 			if(parent != null){
 				level = parent.getLevel() + 1;
 				chainId = parent.getChainId() + Constant.ID_SEPARATOR + parent.getDepartmentId();

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

@@ -230,6 +230,7 @@
     <include refid="Base_Column_List" />
     from tab_haoban_department
     where wx_department_id = #{wxDepartmentId,jdbcType=VARCHAR}
+    and wx_enterprise_id = #{wxEnterpriseId}
     and status_flag = 1
   </select>