From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
index 8edf1d1..071951d 100644
--- a/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
+++ b/skjcmanager/skjcmanager-auth/src/main/java/cn/gistack/auth/service/BladeUserDetailsServiceImpl.java
@@ -157,11 +157,18 @@
deptStr = userInfo.getUser().getDeptId();
}
R<Dept> deptRes = sysClient.getDept(Long.valueOf(deptStr));
- if (StringUtil.isBlank(deptRes.getData().getAdCode()))
+ if (StringUtil.isBlank(deptRes.getData().getAdCode())) {
// 部门为空
- throw new UserDeniedAuthorizationException("没有找到有效组织机构~");
- else
+// throw new UserDeniedAuthorizationException("没有找到有效组织机构~");
+ userInfo.getDetail().set("adCodeBase", "");
+ userInfo.getDetail().set("parentDept",0);
+ } else {
userInfo.getDetail().set("adCodeBase",attResManagePersonClient.getAdBaseById(deptRes.getData().getAdCode()).getData());
+ userInfo.getDetail().set("parentDept",deptRes.getData().getParentId());
+ }
+
+
+
return new BladeUserDetails(user.getId(),
user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
--
Gitblit v1.9.3