From 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 14 九月 2023 12:46:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java b/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java
index 5e12955..a70e65d 100644
--- a/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/zy/crm/system/service/impl/UserServiceImpl.java
@@ -36,6 +36,9 @@
if (Cools.isEmpty(manager)) {
Dept dept = deptService.selectById(deptId);
Dept parent = deptService.selectById(dept.getParentId());
+ if (parent == null) {
+ throw new CoolException("淇濆瓨澶辫触锛屾湭鎵惧埌閮ㄩ棬缁勯暱");
+ }
manager = this.baseMapper.getDeptManager(hostId, parent.getId());
}
if (Cools.isEmpty(manager)) {
--
Gitblit v1.9.1