From ab17f44cc4aa2b15c36d6f523fa3844a338101ce Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 21:31:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index 8e8e886..e656163 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -406,8 +406,12 @@
model.addAttribute("oId",byId.getOperatorId());
return PREFIX+"ball_pre_add1.html";
- }else {
- model.addAttribute("is3","false");
+ }
+
+ if (objectType == 2){
+ model.addAttribute("is3","true");
+ model.addAttribute("oId",UserExt.getUser().getObjectId());
+ return PREFIX+"ball_pre_add2.html";
}
@@ -482,6 +486,10 @@
return PREFIX+"ball_pre_edit1.html";
}
+ if (objectType == 2){
+ return PREFIX+"ball_pre_edit2.html";
+
+ }
return PREFIX+"ball_pre_edit.html";
}
--
Gitblit v1.7.1