From 72bb799fee95b59749d7968348f28f1e611abe42 Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Mon, 7 Jul 2025 10:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=9A=84=E7=A7=91=E7=9B=AE?=
 =?UTF-8?q?=E4=BC=9A=E5=9C=A8=E4=B8=8B=E7=BA=A7=E5=85=AC=E5=8F=B8=E4=B9=9F?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA=E4=BD=BF=E7=94=A8=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=EF=BC=8C=E9=9C=80=E8=A6=81=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java
index 73a82c4..f22767d 100644
--- a/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java
+++ b/main/java/shjh/jhzj7/fi/fi/webapi/AspAccountControler.java
@@ -94,7 +94,6 @@ public class AspAccountControler {
 //        OperationResult operResult;
         Map<String, Long> acctids = new HashMap<>();//科目编号和ID对应关系
         Map<String, DynamicObject> accountMaps = new HashMap<>();//将科目编号与对象关联
-        boolean isIncludNew = false;//本次请求是否有新增科目的标记
 
         //先根据基础信息在集团层面生成科目，不考虑核算维度，使用逐级分配
         //再根据公司信息进行科目分配
@@ -207,7 +206,6 @@ public class AspAccountControler {
 //                }
                 //处理科目使用范围
                 DB.update(DBRoute.of("fi"), insertSql, new Object[]{kmId,JhzjUtils.GROUPID});
-                isIncludNew = true;
             }
             acctids.put(number,acctInfo.getLong("id"));
             accountMaps.put(number,acctInfo);
@@ -287,10 +285,8 @@ public class AspAccountControler {
         }
         //最后处理科目的反分配
         EsbUtils.handleUnAssignNew(companysJson, acctids, entityName);
-        //本次包含新增科目的话，需要处理一下组织范围，集团科目会在下级公司也生成一个范围，需要去掉
-        if(isIncludNew){
-            DB.update(DBRoute.of("fi"), deleteOrgSql, null);
-        }
+        //每次接口调用后，处理一下组织范围，集团的科目会在下级公司也生成一个使用范围，需要去掉
+        DB.update(DBRoute.of("fi"), deleteOrgSql, null);
 
         if(itemsJson.isEmpty()){
             EsbUtils.saveLog(apimenthod,"ESB",json_obj.toString(),null,true,"API");