From 0d59d664b3b81e9264df6ad513d06b1b2c84c931 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 11:43:34 +0800
Subject: [PATCH] 大屏首页储量数量展示，仅展示散粮；抓拍跟踪图片展示业务逻辑调整
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 752f946..388987c 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
@@ -48,12 +48,12 @@
}
if (Constant.USER_TYPE_20.equals(user.getUserType())) {
//閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
- return this.getDeptByContract(user.getUserData());
+ return this.getDeptByBank(user.getUserData());
}
if (Constant.USER_TYPE_30.equals(user.getUserType())) {
//搴撳尯鐢ㄦ埛
String deptId = user.getDeptId() + "";
- if(deptId.length() > 7){
+ if(ContextUtil.isDepotUser(deptId)){
//鏌ヨ鐢ㄦ埛鎵�灞炲簱鍖�
return this.listDept(deptId,null,null);
}else {
@@ -64,17 +64,45 @@
return this.listDept(null,user.getCompanyId(),null);
}
+
/**
- * 鏍规嵁閾惰id锛屽叧鑱斿悎鍚岃〃鏌ヨ搴撳尯鍒楄〃
- * @param bankId
+ * 鏍规嵁鐢ㄦ埛绫诲瀷鑾峰彇瀵瑰簲搴撳尯鍒楄〃淇℃伅APP
+ *
+ * @param
* @return
*/
- public List<Dept> getDeptByContract(String bankId) {
+ public List<Dept> getDeptByUserTypeApp(String userType,String deptId) {
+
+ if (Constant.USER_TYPE_10.equals(userType)) {
+ //鐩戠鐢ㄦ埛锛岀洿鎺ユ煡璇㈢粍缁囦笅鎵�鏈夊簱鍖�
+ return this.listDept(null,userType,null);
+ }
+ if (Constant.USER_TYPE_20.equals(userType)) {
+ //閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
+ return this.getDeptByBank(userType);
+ }
+ if (Constant.USER_TYPE_30.equals(userType)) {
+ //搴撳尯鐢ㄦ埛
+ if(ContextUtil.isDepotUser(deptId)){
+ //鏌ヨ鐢ㄦ埛鎵�灞炲簱鍖�
+ return this.listDept(deptId,null,null);
+ }else {
+ //鏌ヨ鐢ㄦ埛鎵�灞炲叕鍙镐笅鎵�鏈夊簱鍖�
+ return this.listDept(null,null, deptId);
+ }
+ }
+ return this.listDept(null,ContextUtil.getCompanyId(),null);
+ }
+ /**
+ * 鏍规嵁閾惰id锛屽叧鑱斿悎鍚岃〃鏌ヨ搴撳尯鍒楄〃
+ * @param bankId 閾惰鍙�
+ * @return
+ */
+ public List<Dept> getDeptByBank(String bankId) {
if (StringUtils.isBlank(bankId)){
return null;
}
-
QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("c.pledge_bank", bankId);
--
Gitblit v1.9.3