Commit 89dee490 by qwmqiuwenmin

fix

parent a5eb960a
......@@ -121,4 +121,10 @@ public interface DepartmentApiService {
* @return
*/
Integer departmentRecycleCount(String wxEnterpriseId);
/**
* 微信回调删除部门
* @param departmentId
* @return
*/
HaobanResponse wxCallBackDel(String departmentId);
}
......@@ -177,7 +177,7 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
hr.setMessage("存在成员,删除部门失败");
return hr;
}
//调微信的新增接口
//调微信的删除接口
TabHaobanDepartment department = departmentService.selectById(departmentId);
WxEnterpriseDTO enterpriseDTO = wxEnterpriseService.selectById(department.getWxEnterpriseId());
TabHaobanWxApplication application = wxApplicationService.selectByWxEnterpriseIdAndApplicationType(department.getWxEnterpriseId(),1);
......@@ -195,6 +195,30 @@ public class DepartmentApiServiceImpl implements DepartmentApiService {
departmentService.del(departmentId);
return hr;
}
@Override
public HaobanResponse wxCallBackDel(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.del(departmentId);
return hr;
}
@Override
public DepartmentDTO selectByRelatedId(String relatedId) {
......
......@@ -104,7 +104,7 @@ public class MessageApiServiceImpl implements MessageApiService {
}else {
TabHaobanDepartment department = this.departmentService.selectByRelatedId(dto.getId());
if(department != null){
this.departmentApiService.del(department.getDepartmentId());
this.departmentApiService.wxCallBackDel(department.getDepartmentId());
log.info("gic同步删除完成");
}else {
log.info("gic同步删除不存在");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment