From ae9bfd2d66f68a553786ac78b12f4390e65e4e09 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 24 十一月 2023 18:30:18 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index be18b91..b5f9feb 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -151,7 +151,6 @@
List<TStore> operatorId = storeService.list(new QueryWrapper<TStore>().eq("operatorId", objectId));
model.addAttribute("stores",operatorId);
if (UserExt.getUser().getObjectType()==2){
-
// 查询这个运营商管理的省
TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId()));
if (id.getType()==1){
@@ -165,8 +164,9 @@
}
model.addAttribute("operator",objectId);
}
- if (UserExt.getUser().getObjectType()==1)
- model.addAttribute("operator",0);
+ if (UserExt.getUser().getObjectType()==1) model.addAttribute("operator",0);
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ if (UserExt.getUser().getObjectType()==3) model.addAttribute("operator",byId.getOperatorId());
return PREFIX + "TCompetition_add.html";
}
@@ -318,7 +318,7 @@
public Object listUser(@PathVariable Integer id,Integer state) {
try {
Page<Object> page = new PageFactory<>().defaultPage();
- Page<CompetitionUser> data = competitionClient.getPeopleFromId
+ Page<CompetitionUser> data = competitionClient.getPeopleFromId
(new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
return super.packForBT(data);
}catch (Exception e){
@@ -342,8 +342,9 @@
if (UserExt.getUser().getObjectType() == 1){
competition.setAuditStatus(2);
- }else {
+ }else if (UserExt.getUser().getObjectType() == 2){
competition.setAuditStatus(1);
+ competition.setOperatorId(UserExt.getUser().getObjectId());
}
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
--
Gitblit v1.7.1