From 521209c3ad0c7846ee9076de50cffa4c21af52c6 Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Sun, 2 Jul 2023 15:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=A0=E7=99=BB=E9=99=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/user/dto/party/ActivityPartyDTO.java |  2 +-
 .../epdc/user/dto/party/ReportPartyDTO.java   |  5 +++++
 .../epdc/party/entity/ReportPartyEntity.java  |  5 +++++
 .../impl/ActivityPartyServiceImpl.java        | 19 ++++++++++++++++++
 .../service/impl/FlowPartyServiceImpl.java    | 20 +++++++++++++++++++
 .../service/impl/IntoPartyServiceImpl.java    | 14 +++++++++++++
 .../impl/KnightPionnerServiceImpl.java        | 19 ++++++++++++++++++
 .../service/impl/RedSpearheadServiceImpl.java | 19 ++++++++++++++++++
 .../service/impl/ReportPartyServiceImpl.java  | 19 ++++++++++++++++++
 9 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java
index 285a7dbb4..91acb4957 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ActivityPartyDTO.java
@@ -93,7 +93,7 @@ public class ActivityPartyDTO implements Serializable {
     /**
      * 所有部门ID
      */
-	private String allDeptIds;
+	private String[] allDeptIds;
 
     /**
      * 所有部门名称
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
index 0a466ebc2..aca589c71 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/user/dto/party/ReportPartyDTO.java
@@ -59,6 +59,11 @@ public class ReportPartyDTO implements Serializable {
      */
 	private String deptId;
 
+    /**
+     * 是否在市北居住
+     */
+	private Integer shiBei;
+
     /**
      * 居住小区名称
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
index cea67d61a..d21b0d4f9 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/entity/ReportPartyEntity.java
@@ -55,6 +55,11 @@ public class ReportPartyEntity extends DeptScope {
      */
 	private String deptId;
 
+	/**
+	 * 是否在市北居住
+	 */
+	private Integer shiBei;
+
     /**
      * 居住小区名称
      */
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java
index 349c4607c..050ec13bd 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ActivityPartyServiceImpl.java
@@ -24,6 +24,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -110,6 +112,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(ActivityPartyDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
         if (null != dto.getReportPartyIds()) {
             String[] partyIds = dto.getReportPartyIds();
@@ -129,6 +134,8 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
         if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
             entity.setDeptId(String.valueOf(dto.getDeptId()));
             parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -145,6 +152,9 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ActivityPartyDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         ActivityPartyEntity entity = ConvertUtils.sourceToTarget(dto, ActivityPartyEntity.class);
         if (null != dto.getReportPartyIds()) {
             String[] partyIds = dto.getReportPartyIds();
@@ -164,6 +174,8 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
         if (StringUtils.isNotEmpty(String.valueOf(dto.getDeptId()))) {
             entity.setDeptId(String.valueOf(dto.getDeptId()));
             parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -184,4 +196,11 @@ public class ActivityPartyServiceImpl extends BaseServiceImpl<ActivityPartyDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void setDeptId(ActivityPartyDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        String deptId = String.valueOf(user.getDeptId());
+        dto.setDeptId(user.getDeptId());
+        dto.setAllDeptIds(new String[]{deptId});
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java
index b9a6de5ec..900847051 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/FlowPartyServiceImpl.java
@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -103,11 +105,16 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(FlowPartyDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         FlowPartyEntity entity = ConvertUtils.sourceToTarget(dto, FlowPartyEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -125,11 +132,17 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(FlowPartyDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         FlowPartyEntity entity = ConvertUtils.sourceToTarget(dto, FlowPartyEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
+
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -150,4 +163,11 @@ public class FlowPartyServiceImpl extends BaseServiceImpl<FlowPartyDao, FlowPart
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void setDeptId(FlowPartyDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        String deptId = String.valueOf(user.getDeptId());
+        dto.setDeptId(user.getDeptId());
+        dto.setAllDeptIds(new String[]{deptId});
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java
index 357e20b8b..58ebb67b9 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/IntoPartyServiceImpl.java
@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -92,11 +94,16 @@ public class IntoPartyServiceImpl extends BaseServiceImpl<IntoPartyDao, IntoPart
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(IntoPartyFormDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         IntoPartyEntity entity = ConvertUtils.sourceToTarget(dto, IntoPartyEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]));
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -125,4 +132,11 @@ public class IntoPartyServiceImpl extends BaseServiceImpl<IntoPartyDao, IntoPart
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void setDeptId(IntoPartyFormDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        String deptId = String.valueOf(user.getDeptId());
+        dto.setDeptId(deptId);
+        dto.setAllDeptIds(new String[]{deptId});
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java
index 36fd7382a..2b0f69603 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/KnightPionnerServiceImpl.java
@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -103,11 +105,17 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(KnightPionnerDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         KnightPionnerEntity entity = ConvertUtils.sourceToTarget(dto, KnightPionnerEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
+
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -124,11 +132,16 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(KnightPionnerDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         KnightPionnerEntity entity = ConvertUtils.sourceToTarget(dto, KnightPionnerEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -149,4 +162,10 @@ public class KnightPionnerServiceImpl extends BaseServiceImpl<KnightPionnerDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void setDeptId(KnightPionnerDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        String deptId = String.valueOf(user.getDeptId());
+        dto.setDeptId(user.getDeptId());
+        dto.setAllDeptIds(new String[]{deptId});
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java
index c3da53512..7faeb3fb9 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/RedSpearheadServiceImpl.java
@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -103,11 +105,16 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(RedSpearheadDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         RedSpearheadEntity entity = ConvertUtils.sourceToTarget(dto, RedSpearheadEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -124,11 +131,16 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(RedSpearheadDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         RedSpearheadEntity entity = ConvertUtils.sourceToTarget(dto, RedSpearheadEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(String.valueOf(dto.getDeptId()));
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -149,4 +161,11 @@ public class RedSpearheadServiceImpl extends BaseServiceImpl<RedSpearheadDao, Re
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void setDeptId(RedSpearheadDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        String deptId = String.valueOf(user.getDeptId());
+        dto.setDeptId(user.getDeptId());
+        dto.setAllDeptIds(new String[]{deptId});
+    }
+
 }
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
index c30482da5..8c2c4a540 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/party/service/impl/ReportPartyServiceImpl.java
@@ -23,6 +23,8 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
@@ -94,11 +96,16 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(ReportPartyDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -115,11 +122,16 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(ReportPartyDTO dto) {
+        if (dto.getAllDeptIds().length == 0) {
+            setDeptId(dto);
+        }
         ReportPartyEntity entity = ConvertUtils.sourceToTarget(dto, ReportPartyEntity.class);
         Result<ParentAndAllDeptDTO> parentResult = null;
         if (dto.getAllDeptIds() != null && dto.getAllDeptIds().length > 1) {
             entity.setDeptId(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
             parentResult = adminFeignClient.getParentAndAllDept(dto.getAllDeptIds()[dto.getAllDeptIds().length - 1]);
+        } else {
+            parentResult = adminFeignClient.getParentAndAllDept(dto.getDeptId());
         }
         if (!parentResult.success() || parentResult.getData() == null) {
             throw new RenException("获取部门信息失败");
@@ -140,4 +152,11 @@ public class ReportPartyServiceImpl extends BaseServiceImpl<ReportPartyDao, Repo
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    private void setDeptId(ReportPartyDTO dto) {
+        UserDetail user = SecurityUser.getUser();
+        String deptId = String.valueOf(user.getDeptId());
+        dto.setDeptId(deptId);
+        dto.setAllDeptIds(new String[]{deptId});
+    }
+
 }