From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-user/src/main/java/com/java110/user/cmd/user/DeleteStaffOrgRelCmd.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/user/DeleteStaffOrgRelCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/DeleteStaffOrgRelCmd.java
index e50babc..243d03c 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/DeleteStaffOrgRelCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/DeleteStaffOrgRelCmd.java
@@ -29,8 +29,13 @@
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
-        orgStaffRelDto.setOrgId(reqJson.getString("orgId"));
         orgStaffRelDto.setStaffId(reqJson.getString("userId"));
+        //缁勭粐鍏崇郴鏁�
+        List<OrgStaffRelDto> orgStaffRelDtos1 = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
+        if (orgStaffRelDtos1.size() < 2) {
+            throw new CmdException("鑷冲皯淇濈暀涓�涓粍缁囧叧绯伙紝鏆傛椂鏃犳硶鍒犻櫎锛�");
+        }
+        orgStaffRelDto.setRelId(reqJson.getString("relId"));
         List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
         if (orgStaffRelDtos == null || orgStaffRelDtos.size() < 1) {
             throw new CmdException("鍏崇郴涓嶅瓨鍦�");

--
Gitblit v1.8.0