fix

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

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.xpath.operations.Bool;
 
+import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
 import com.github.pagehelper.Page;
 
@@ -53,4 +54,6 @@ public interface DepartmentMapper {
 	int countSyncDepartmentByEnterpriseId(@Param("enterpriseId")String enterpriseId);
 
 	int countByDepartment(@Param("departmentId")String departmentId);
+
+	TabHaobanDepartment getByRelatedIdNotInRecycle(@Param("departmentId")String relatedId);
 }
\ No newline at end of file

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

@@ -42,4 +42,6 @@ public interface DepartmentService {
 
 	int countByDepartment(String departmentId);
 
+	DepartmentDTO getByRelatedIdNotInRecycle(String relatedId);
+
 }

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

@@ -159,4 +159,9 @@ public class DepartmentServiceImpl implements DepartmentService {
 		return mapper.countByDepartment(departmentId);
 	}
 
+	@Override
+	public DepartmentDTO getByRelatedIdNotInRecycle(String relatedId) {
+		return EntityUtil.changeEntityByJSON(DepartmentDTO.class,mapper.getByRelatedIdNotInRecycle(relatedId));
+	}
+
 }

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

@@ -351,7 +351,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                 startIndex = len - 1;
             }
             for(int i = startIndex ; i>=0 && i< len; i--){
-                DepartmentDTO department = this.departmentService.getByRelatedId(arr[i]);
+                DepartmentDTO department = this.departmentService.getByRelatedIdNotInRecycle(arr[i]);
                 log.info("当前节点id：{}, {}", arr[i], JSON.toJSONString(department));
                 if(department != null){
                     return department;

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

@@ -377,6 +377,15 @@
     and status_flag = 1
   </select>
   
+  <select id="getByRelatedIdNotInRecycle" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select 
+    <include refid="Base_Column_List" />
+    from tab_haoban_department
+    where related_id = #{relatedId}
+    and status_flag = 1
+    and recycle_flag != 1
+  </select>
+  
   
   <select id="pageByParentId" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select