From 4b2b0ec05306c285cff9f95064cf70b5e6e37516 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 15 四月 2026 11:14:52 +0800
Subject: [PATCH] 添加微信消息推送工具类

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 47 insertions(+), 13 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..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,18 +43,54 @@
         //鑾峰彇褰撳墠鐧诲綍浜�
         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.getDeptByContract(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(deptId.length() > 7){
+            if(ContextUtil.isDepotUser(deptId)){
                 //鏌ヨ鐢ㄦ埛鎵�灞炲簱鍖�
                 return this.listDept(deptId,null,null);
             }else {
@@ -61,20 +98,17 @@
                 return this.listDept(null,null, deptId);
             }
         }
-        return this.listDept(null,user.getCompanyId(),null);
+        return this.listDept(null,ContextUtil.getCompanyId(),null);
     }
-
     /**
      * 鏍规嵁閾惰id锛屽叧鑱斿悎鍚岃〃鏌ヨ搴撳尯鍒楄〃
-     * @param bankId
+     * @param bankId 閾惰鍙�
      * @return
      */
-    public List<Dept> getDeptByContract(String bankId) {
-
+    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