From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-n2/src/main/java/com/ld/igds/n2/controller/N2Controller.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/igds-n2/src/main/java/com/ld/igds/n2/controller/N2Controller.java b/igds-n2/src/main/java/com/ld/igds/n2/controller/N2Controller.java
index 506e3f4..bc10d82 100644
--- a/igds-n2/src/main/java/com/ld/igds/n2/controller/N2Controller.java
+++ b/igds-n2/src/main/java/com/ld/igds/n2/controller/N2Controller.java
@@ -80,7 +80,7 @@
if (DepotType.TYPE_02.getCode().equals(depotType) || DepotType.TYPE_04.getCode().equals(depotType)) {
view.setViewName("admin/n2/n2-hand2");
} else {
- if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId())) {
+ if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId()) || "5325".equals(user.getCompanyId())) {
view.setViewName("admin/n2/n2-hand-5013");
} else {
view.setViewName("admin/n2/n2-hand1");
@@ -128,7 +128,7 @@
view.addObject("n2ImgMap", n2ImgMap);
view.setViewName("admin/n2/n2-hand1");
- if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId())) {
+ if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId()) || "5325".equals(user.getCompanyId())) {
view.setViewName("admin/n2/n2-hand-5013");
}
return view;
--
Gitblit v1.9.3