From ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 19 十二月 2025 11:17:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java
index 5d623d0..0ec94b3 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/group/GroupController.java
@@ -5,6 +5,7 @@
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.sys.manager.common.CommonManager;
import com.fzzy.sys.manager.gropu.GroupManager;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -48,6 +49,9 @@
Slogan dicSlogan = commonManager.getDicSlogan();
view.put("dicSlogan", dicSlogan);
+ view.put("bizType", "screen");
+ view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
+
//鏌ヨ搴撳尯淇℃伅
List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
view.put("deptList", deptList);
@@ -71,6 +75,10 @@
Slogan dicSlogan = commonManager.getDicSlogan();
view.put("dicSlogan", dicSlogan);
+
+ view.put("bizType", "screen");
+ view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
+
//鏌ヨ搴撳尯淇℃伅
List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
view.put("deptList", deptList);
@@ -94,6 +102,9 @@
Slogan dicSlogan = commonManager.getDicSlogan();
view.put("dicSlogan", dicSlogan);
+ view.put("bizType", "screen");
+ view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);
+
view.put("defaultAreaCode", "650000");
//鑾峰彇鏂扮枂鍖哄垝淇℃伅
--
Gitblit v1.9.3