From 257ec3c2be7f3d350833044c224fb3b172b037a0 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 28 Jul 2022 17:35:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/DepartmentServiceImpl.java    | 9 +++++----
 .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
index 51ab136d05..8f71eb4716 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
@@ -328,6 +328,7 @@ public class DepartmentServiceImpl implements DepartmentService {
         }
         //查不到工作人员就直接返回
         if (null == userResult.getData()) {
+            resultDTO.setType(true);
             return resultDTO;
         }
 
@@ -497,13 +498,14 @@ public class DepartmentServiceImpl implements DepartmentService {
         if (!projectResult.success()) {
             throw new RenException("获取工作人员代办项目数据失败" + projectResult.getMsg());
         }
-        if(projectResult.getData().size()>NumConstant.ZERO){
-            String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作",("party_unit".equals(formDTO.getDeptType())?"联建单位":"社会自组织"));
+        if (projectResult.getData().size() > NumConstant.ZERO) {
+            String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作", ("party_unit".equals(formDTO.getDeptType()) ? "联建单位" : "社会自组织"));
             resultDTO.setMsg(msg);
+            return resultDTO;
         }
         //2.无代办项目的则删除部门、工作人员信息、修改联建单位/社会自组织业务数据
         //2-1.删除部门
-        customerDepartmentDao.deleteById(formDTO.getId());
+        customerDepartmentDao.deleteById(formDTO.getDeptId());
         //2-2.删除部门人员关系数据
         LambdaQueryWrapper<CustomerStaffDepartmentEntity> query = new LambdaQueryWrapper<>();
         query.eq(CustomerStaffDepartmentEntity::getDepartmentId, formDTO.getDeptId());
@@ -511,7 +513,6 @@ public class DepartmentServiceImpl implements DepartmentService {
         customerStaffDepartmentDao.delete(query);
         //2-3.删除人员注册关系数据
         LambdaQueryWrapper<StaffOrgRelationEntity> StaffOrgRelation = new LambdaQueryWrapper<>();
-        StaffOrgRelation.eq(StaffOrgRelationEntity::getOrgId, formDTO.getDeptId());
         StaffOrgRelation.eq(StaffOrgRelationEntity::getStaffId, formDTO.getDeptStaffId());
         staffOrgRelationDao.delete(StaffOrgRelation);
         //2-4.删除工作人员数据
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
index b25d014fc5..8fcc9b5338 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
@@ -886,9 +886,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 
         //2.查询客户管理平台对应角色【联建单位负责人、社区自组织负责人】
         GovRoleListDTO roleDTO = new GovRoleListDTO();
-        roleDTO.setName("party_unit".equals(fromDTO.getDeptType())?"联建单位负责人":"社区自组织负责人");
+        roleDTO.setCustomerId(fromDTO.getCustomerId());
+        roleDTO.setName("party_unit".equals(fromDTO.getDeptType()) ? "联建单位负责人" : "社区自组织负责人");
         Result<GovRoleDTO> resultRole = govAccessFeignClient.getGovRole(roleDTO);
-        if (!resultRole.success()) {
+        if (!resultRole.success() || null == resultRole.getData()) {
             throw new RenException("人员添加失败" + resultRole.getMsg());
         }
         List<String> newRoles = new ArrayList<>();