From b22abc889e8121fcbe0b6e174a2259605504391a Mon Sep 17 00:00:00 2001
From: SondonYong <songdongyong@zcloudchina.com>
Date: Wed, 5 Nov 2025 17:34:19 +0800
Subject: [PATCH] =?UTF-8?q?dev:=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/info/command/PostUpdateExe.java     | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
index 4fbe969..8d47794 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/PostUpdateExe.java
@@ -34,24 +34,35 @@ public class PostUpdateExe {
         boolean res = postGateway.update(postE);
 
         // 岗位关联部门
-        if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){
-            postDepartmentGateway.deletedPostDepartment(postE.getId());
-            List<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds());
-            if(CollUtil.isNotEmpty(postDepartmentEList)){
-                res = postDepartmentGateway.addList(postDepartmentEList);
-            }
-        }else {
-            // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据
-            if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 0){
+        // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据
+        if(res){
+            if (postUpdateCmd.getSupervisionFlag() == null || postUpdateCmd.getSupervisionFlag() == 0){
                 postDepartmentGateway.deletedPostDepartment(postE.getId());
-            }
-            if(res && postUpdateCmd.getSupervisionFlag() == null){
+            }else if(postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){
+                // 是监管单位
                 postDepartmentGateway.deletedPostDepartment(postE.getId());
+                List<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds());
+                if(CollUtil.isNotEmpty(postDepartmentEList)){
+                    res = postDepartmentGateway.addList(postDepartmentEList);
+                }
             }
         }
-        /**
-         *
-         */
+
+//        if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 1){
+//            postDepartmentGateway.deletedPostDepartment(postE.getId());
+//            List<PostDepartmentE> postDepartmentEList = postE.addDepartmentIds(postE.getId(), postUpdateCmd.getDepartmentIds());
+//            if(CollUtil.isNotEmpty(postDepartmentEList)){
+//                res = postDepartmentGateway.addList(postDepartmentEList);
+//            }
+//        }else {
+//            // 修改时如果改为不是监管岗位, 则删除岗位-部门关联表数据
+//            if(res && postUpdateCmd.getSupervisionFlag() != null && postUpdateCmd.getSupervisionFlag() == 0){
+//                postDepartmentGateway.deletedPostDepartment(postE.getId());
+//            }
+//            if(res && postUpdateCmd.getSupervisionFlag() == null){
+//                postDepartmentGateway.deletedPostDepartment(postE.getId());
+//            }
+//        }
 
         if (!res) {
             throw new BizException("修改失败");