From 3a5e49666af1da441633b0a9bae4c3c2b18974b3 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 14 四月 2026 16:05:41 +0800
Subject: [PATCH] 质押合同添加业务经理绑定，H5相关逻辑完善
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index c31f47b..d693658 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -42,17 +43,53 @@
//鑾峰彇褰撳墠鐧诲綍浜�
SysUser user = ContextUtil.getLoginUser();
- if (Constant.USER_TYPE_10.equals(user.getUserType())) {
+ if(null != user){
+ if (Constant.USER_TYPE_10.equals(user.getUserType())) {
+ //鐩戠鐢ㄦ埛锛岀洿鎺ユ煡璇㈢粍缁囦笅鎵�鏈夊簱鍖�
+ return this.listDept(null,user.getCompanyId(),null);
+ }
+ if (Constant.USER_TYPE_20.equals(user.getUserType())) {
+ //閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
+ return this.getDeptByBank(user.getUserData());
+ }
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ //搴撳尯鐢ㄦ埛
+ String deptId = user.getDeptId() + "";
+ if(ContextUtil.isDepotUser(deptId)){
+ //鏌ヨ鐢ㄦ埛鎵�灞炲簱鍖�
+ return this.listDept(deptId,null,null);
+ }else {
+ //鏌ヨ鐢ㄦ埛鎵�灞炲叕鍙镐笅鎵�鏈夊簱鍖�
+ return this.listDept(null,null, deptId);
+ }
+ }
+ return this.listDept(null,user.getCompanyId(),null);
+
+ }
+ return this.listDept(null,ContextUtil.getCompanyId(),null);
+
+ }
+
+
+ /**
+ * 鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瀵瑰簲搴撳尯鍒楄〃淇℃伅APP
+ *
+ * @param
+ * @return
+ */
+ public List<Dept> getDeptByUserTypeApp(String userType,String deptId) {
+
+
+ if (Constant.USER_TYPE_10.equals(userType)) {
//鐩戠鐢ㄦ埛锛岀洿鎺ユ煡璇㈢粍缁囦笅鎵�鏈夊簱鍖�
- return this.listDept(null,user.getCompanyId(),null);
+ return this.listDept(null,userType,null);
}
- if (Constant.USER_TYPE_20.equals(user.getUserType())) {
+ if (Constant.USER_TYPE_20.equals(userType)) {
//閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
- return this.getDeptByBank(user.getUserData());
+ return this.getDeptByBank(userType);
}
- if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ if (Constant.USER_TYPE_30.equals(userType)) {
//搴撳尯鐢ㄦ埛
- String deptId = user.getDeptId() + "";
if(ContextUtil.isDepotUser(deptId)){
//鏌ヨ鐢ㄦ埛鎵�灞炲簱鍖�
return this.listDept(deptId,null,null);
@@ -61,9 +98,8 @@
return this.listDept(null,null, deptId);
}
}
- return this.listDept(null,user.getCompanyId(),null);
+ return this.listDept(null,ContextUtil.getCompanyId(),null);
}
-
/**
* 鏍规嵁閾惰id锛屽叧鑱斿悎鍚岃〃鏌ヨ搴撳尯鍒楄〃
* @param bankId 閾惰鍙�
--
Gitblit v1.9.3