fix

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

@@ -127,4 +127,10 @@ public interface DepartmentApiService {
 	 * @return
 	 */
 	HaobanResponse wxCallBackDel(String departmentId);
+	/**
+	 * 微信回调放回收站
+	 * @param departmentId
+	 * @return
+	 */
+	HaobanResponse wxCallBackrecycle(String departmentId);
 }

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

@@ -264,6 +264,31 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
 		departmentService.recycle(departmentId);
 		return hr;
 	}
+	
+	@Override
+	public HaobanResponse wxCallBackrecycle(String departmentId) {
+		HaobanResponse hr = new HaobanResponse();
+		hr.setErrorCode(1);
+		
+		List<TabHaobanDepartment> list = departmentService.listByParentId(departmentId);
+		logger.info("【部门删除】list.size={}",list.size());
+		if(!list.isEmpty()) {
+			hr.setErrorCode(0);
+			hr.setMessage("存在子部门，删除部门失败");
+			return hr;
+		}
+		
+		List<TabHaobanStaffDepartmentRelated> staffList = staffDepartmentService.listByDepartmentId(departmentId);
+		logger.info("【部门删除】staffList.size={}",staffList.size());
+		if(!staffList.isEmpty()) {
+			hr.setErrorCode(0);
+			hr.setMessage("存在成员，删除部门失败");
+			return hr;
+		}
+		
+		departmentService.recycle(departmentId);
+		return hr;
+	}
 
 	@Override
 	public Page<DepartmentDTO> pageDepartmentByParams(BasePageInfo pageInfo, String wxEnterpriseId, String keyword,

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

@@ -104,7 +104,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             }else {
                 TabHaobanDepartment department = this.departmentService.selectByRelatedId(dto.getId());
                 if(department != null){
-                    this.departmentApiService.wxCallBackDel(department.getDepartmentId());
+                    this.departmentApiService.del(department.getDepartmentId());
                     log.info("gic同步删除完成");
                 }else {
                     log.info("gic同步删除不存在");
@@ -166,7 +166,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             	if(StringUtils.isBlank(department.getRelatedId())){
             		this.departmentService.del(department.getDepartmentId());
             	}else{
-            		this.departmentApiService.recycle(department.getDepartmentId());
+            		this.departmentApiService.wxCallBackrecycle(department.getDepartmentId());
             	}
                 log.info("企业微信删除同步完成");
             }