From f9131f1d69889349aba446b7595755182a010bd7 Mon Sep 17 00:00:00 2001
From: Parker <meet.parker@foxmail.com>
Date: Mon, 8 Aug 2022 20:24:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/dict/service/impl/DictDetailServiceImpl.java     | 3 +++
 .../system/role/service/impl/RoleMenuRefServiceImpl.java    | 3 +++
 .../system/user/service/impl/UserOrgRefServiceImpl.java     | 4 ++++
 .../system/user/service/impl/UserRoleRefServiceImpl.java    | 4 +++-
 .../modulars/system/user/service/impl/UserServiceImpl.java  | 6 ++----
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
index 93b603f1..60b4e8ce 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
@@ -37,6 +37,7 @@ import org.opsli.modulars.system.dict.mapper.DictDetailMapper;
 import org.opsli.modulars.system.dict.service.IDictDetailService;
 import org.opsli.modulars.system.dict.service.IDictService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -54,6 +55,8 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
 
     @Autowired(required = false)
     private DictDetailMapper mapper;
+
+    @Lazy
     @Autowired
     private IDictService iDictService;
 
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java
index 72722675..dc8fc0a3 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleMenuRefServiceImpl.java
@@ -31,6 +31,7 @@ import org.opsli.modulars.system.role.mapper.RoleMenuRefMapper;
 import org.opsli.modulars.system.role.service.IRoleMenuRefService;
 import org.opsli.modulars.system.user.service.IUserRoleRefService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +49,8 @@ public class RoleMenuRefServiceImpl extends ServiceImpl<RoleMenuRefMapper,SysRol
 
     @Autowired(required = false)
     private RoleMenuRefMapper mapper;
+
+    @Lazy
     @Autowired
     private IUserRoleRefService iUserRoleRefService;
 
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java
index fa39f1a8..abe9038d 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserOrgRefServiceImpl.java
@@ -45,6 +45,7 @@ import org.opsli.modulars.system.user.mapper.UserOrgRefMapper;
 import org.opsli.modulars.system.user.service.IUserOrgRefService;
 import org.opsli.modulars.system.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -72,8 +73,11 @@ public class UserOrgRefServiceImpl extends ServiceImpl<UserOrgRefMapper, SysUser
     @Autowired(required = false)
     private UserOrgRefMapper mapper;
 
+    @Lazy
     @Autowired
     private IUserService iUserService;
+
+    @Lazy
     @Autowired
     private ISysOrgService iSysOrgService;
 
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java
index 1270b9a5..f9028fce 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserRoleRefServiceImpl.java
@@ -60,18 +60,20 @@ import java.util.List;
  * @date 2020-09-16 17:33
  */
 @Service
-@Lazy
 public class UserRoleRefServiceImpl extends ServiceImpl<UserRoleRefMapper, SysUserRoleRef> implements IUserRoleRefService {
 
     @Autowired(required = false)
     private UserRoleRefMapper mapper;
 
+    @Lazy
     @Autowired
     private IRoleService iRoleService;
 
+    @Lazy
     @Autowired
     private IUserService iUserService;
 
+    @Lazy
     @Autowired
     private IMenuService iMenuService;
 
diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java
index ffd8ef7d..d7952295 100644
--- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java
+++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java
@@ -17,12 +17,10 @@ package org.opsli.modulars.system.user.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
@@ -46,7 +44,6 @@ import org.opsli.core.utils.OptionsUtil;
 import org.opsli.core.utils.UserUtil;
 import org.opsli.core.utils.VerificationCodeUtil;
 import org.opsli.modulars.system.SystemMsg;
-import org.opsli.modulars.system.menu.service.IMenuService;
 import org.opsli.modulars.system.role.entity.SysRole;
 import org.opsli.modulars.system.role.service.IRoleService;
 import org.opsli.modulars.system.user.entity.SysUser;
@@ -55,7 +52,7 @@ import org.opsli.modulars.system.user.mapper.UserMapper;
 import org.opsli.modulars.system.user.service.IUserRoleRefService;
 import org.opsli.modulars.system.user.service.IUserService;
 import org.opsli.plugins.security.utils.PasswordUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -72,6 +69,7 @@ import java.util.List;
  * @date 2020-09-16 17:33
  */
 @AllArgsConstructor
+@Lazy
 @Service
 public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserModel> implements IUserService {