更新子账号也更新工作流的部门和人员的缓存
This commit is contained in:
parent
060c0eacd2
commit
48b530d057
@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
|
|||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.hutool.crypto.SecureUtil;
|
import cn.hutool.crypto.SecureUtil;
|
||||||
|
import cn.hutool.extra.spring.SpringUtil;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
@ -19,6 +20,7 @@ import com.gexin.fastjson.JSON;
|
|||||||
import com.gexin.fastjson.TypeReference;
|
import com.gexin.fastjson.TypeReference;
|
||||||
import com.wflow.bean.entity.WflowModels;
|
import com.wflow.bean.entity.WflowModels;
|
||||||
import com.wflow.mapper.WflowModelsMapper;
|
import com.wflow.mapper.WflowModelsMapper;
|
||||||
|
import com.wflow.workflow.service.impl.MemoryOrgOwnershipServiceImpl;
|
||||||
import com.zhgd.exception.CustomException;
|
import com.zhgd.exception.CustomException;
|
||||||
import com.zhgd.jeecg.common.api.vo.Result;
|
import com.zhgd.jeecg.common.api.vo.Result;
|
||||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
@ -1040,6 +1042,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
|||||||
}
|
}
|
||||||
systemUserMapper.insert(systemUser);
|
systemUserMapper.insert(systemUser);
|
||||||
addBaseRoleUsers(systemUser);
|
addBaseRoleUsers(systemUser);
|
||||||
|
SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addBaseRoleUsers(SystemUser systemUser) {
|
private void addBaseRoleUsers(SystemUser systemUser) {
|
||||||
@ -1143,6 +1146,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
|||||||
queryWrapper1.lambda().eq(BaseRoleUser::getUserId, systemUser.getUserId());
|
queryWrapper1.lambda().eq(BaseRoleUser::getUserId, systemUser.getUserId());
|
||||||
baseRoleUserMapper.delete(queryWrapper1);
|
baseRoleUserMapper.delete(queryWrapper1);
|
||||||
addBaseRoleUsers(systemUser);
|
addBaseRoleUsers(systemUser);
|
||||||
|
if (!Objects.equals(oldUser.getXzProjectOrgId(), systemUser.getXzProjectOrgId())) {
|
||||||
|
SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<String, Object> getUserAuthority(Long userId, Integer accountType, String sn, String headquartersSn, Integer styleType, Integer isApp) {
|
public Map<String, Object> getUserAuthority(Long userId, Integer accountType, String sn, String headquartersSn, Integer styleType, Integer isApp) {
|
||||||
@ -1581,6 +1587,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
|
|||||||
} else {
|
} else {
|
||||||
deleteUser(id);
|
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) {
|
private void getUserIds(JSONObject children, List<String> userIds) {
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.xz.service.impl;
|
|||||||
|
|
||||||
import cn.hutool.core.collection.CollUtil;
|
import cn.hutool.core.collection.CollUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import cn.hutool.extra.spring.SpringUtil;
|
||||||
import com.alibaba.fastjson.JSONArray;
|
import com.alibaba.fastjson.JSONArray;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.wflow.bean.entity.WflowModels;
|
import com.wflow.bean.entity.WflowModels;
|
||||||
import com.wflow.mapper.WflowModelsMapper;
|
import com.wflow.mapper.WflowModelsMapper;
|
||||||
|
import com.wflow.workflow.service.impl.MemoryOrgOwnershipServiceImpl;
|
||||||
import com.zhgd.exception.CustomException;
|
import com.zhgd.exception.CustomException;
|
||||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||||
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
|
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.basicdata.mapper.SystemUserMapper;
|
||||||
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
|
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
|
||||||
import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
|
import com.zhgd.xmgl.modules.xz.entity.XzProjectOrg;
|
||||||
@ -171,6 +174,9 @@ public class XzProjectOrgServiceImpl extends ServiceImpl<XzProjectOrgMapper, XzP
|
|||||||
xzProjectOrg.setAncestors(null);
|
xzProjectOrg.setAncestors(null);
|
||||||
baseMapper.updateById(xzProjectOrg);
|
baseMapper.updateById(xzProjectOrg);
|
||||||
}
|
}
|
||||||
|
if (!Objects.equals(oldPo.getParentId(), xzProjectOrg.getParentId())) {
|
||||||
|
SpringUtil.getBean(MemoryOrgOwnershipServiceImpl.class).loadByDbToCatch();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user