From f0f3337c3e7f18e48c89a4d9efbc67226f256f2a Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sat, 24 May 2025 17:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=90=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=B9=9F=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C=E6=B5=81=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=92=8C=E4=BA=BA=E5=91=98=E7=9A=84=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/service/impl/SystemUserServiceImpl.java    | 9 +++++++++
 .../modules/xz/service/impl/XzProjectOrgServiceImpl.java | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index 80a62aadf..836174153 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.*;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gexin.fastjson.JSON;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.mapper.WflowModelsMapper;
+import com.wflow.workflow.service.impl.MemoryOrgOwnershipServiceImpl;
 import com.zhgd.exception.CustomException;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
@@ -1026,6 +1028,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         }
         systemUserMapper.insert(systemUser);
         addBaseRoleUsers(systemUser);
+        SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
     }
 
     private void addBaseRoleUsers(SystemUser systemUser) {
@@ -1099,6 +1102,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         queryWrapper1.lambda().eq(BaseRoleUser::getUserId, systemUser.getUserId());
         baseRoleUserMapper.delete(queryWrapper1);
         addBaseRoleUsers(systemUser);
+        if (!Objects.equals(systemUser1.getXzProjectOrgId(), systemUser.getXzProjectOrgId())) {
+            SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
+        }
     }
 
     public Map<String, Object> getUserAuthority(Long userId, Integer accountType, String sn, String headquartersSn, Integer styleType) {
@@ -1491,6 +1497,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         } else {
             deleteUser(id);
         }
+        if (Objects.equals(systemUser.getAccountType(), SystemUserAccountTypeEnum.PROJECT_SUB_ACCOUNT.getValue())) {
+            SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
+        }
     }
 
     private void getUserIds(JSONObject children, List<String> userIds) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java
index edf6578a1..327c0d304 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzProjectOrgServiceImpl.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.xz.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +13,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.wflow.bean.entity.WflowModels;
 import com.wflow.mapper.WflowModelsMapper;
+import com.wflow.workflow.service.impl.MemoryOrgOwnershipServiceImpl;
 import com.zhgd.exception.CustomException;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
+import com.zhgd.xmgl.modules.basicdata.enums.SystemUserAccountTypeEnum;
 import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper;
 import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
 import com.zhgd.xmgl.modules.xz.mapper.XzProjectOrgMapper;
@@ -161,6 +164,9 @@ public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzP
             xzProjectOrg.setAncestors(null);
             baseMapper.updateById(xzProjectOrg);
         }
+        if (!Objects.equals(oldPo.getParentId(), xzProjectOrg.getParentId())) {
+            SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
+        }
     }
 
     @Override