From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 1b474fe..48bd745 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -29,6 +29,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -57,25 +58,25 @@
@Autowired
private ITTaxiCardService cardService;
-
- @Autowired
- private ITCompanyCityService tCompanyCityService;
-
- @Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Autowired
- private ISpellOrderRuleService spellOrderRuleService;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
-
-
-
-
- /**
- * 跳转到修改平台信息
- */
+
+ @Autowired
+ private ITCompanyCityService tCompanyCityService;
+
+ @Autowired
+ private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
+
+ @Autowired
+ private ISpellOrderRuleService spellOrderRuleService;
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+ @Value("${pushMinistryOfTransport}")
+ private boolean pushMinistryOfTransport;
+
+
+ /**
+ * 跳转到修改平台信息
+ */
@RequestMapping("/admin_update")
public String tCompanyUpdate(Model model) {
TCompany tCompany = tCompanyService.selectOne(new EntityWrapper<TCompany>().eq("type",1).notIn("flag",3));
@@ -127,13 +128,13 @@
*/
@RequestMapping("/tCompany_addFranchisee")
public String tCompany_addFranchisee(Model model) {
- Integer roleType = ShiroExtUtil.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if (1 == roleType){
//查询分公司
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
model.addAttribute("companyList",companyList);
}else if (2 == roleType){
- TCompany tCompany = tCompanyService.selectById(ShiroExtUtil.getUser().getObjectId());
+ TCompany tCompany = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
model.addAttribute("company",tCompany);
}
model.addAttribute("roleType",roleType);
@@ -196,7 +197,7 @@
model.addAttribute("item", tCompany);
LogObjectHolder.me().set(tCompany);
- Integer roleType = ShiroExtUtil.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
model.addAttribute("roleType", roleType);
TCompany obj = tCompanyService.selectById(tCompany.getSuperiorId());
@@ -222,13 +223,13 @@
model.addAttribute("item", tCompany);
LogObjectHolder.me().set(tCompany);
- Integer roleType = ShiroExtUtil.getUser().getRoleType();
+ Integer roleType = shiroExtUtil.getUser().getRoleType();
if (1 == roleType) {
//查询分公司
List<TCompany> companyList = tCompanyService.selectList(new EntityWrapper<TCompany>().eq("type", 2));
model.addAttribute("companyList", companyList);
} else if (2 == roleType) {
- TCompany obj = tCompanyService.selectById(ShiroExtUtil.getUser().getObjectId());
+ TCompany obj = tCompanyService.selectById(shiroExtUtil.getUser().getObjectId());
model.addAttribute("company", obj);
}
model.addAttribute("roleType", roleType);
@@ -319,10 +320,10 @@
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- if (ShiroExtUtil.getUser().getRoleType() == 3) {
+ if (shiroExtUtil.getUser().getRoleType() == 3) {
page.setRecords(null);
} else {
- page.setRecords(tCompanyService.getFranchiseeList(page, beginTime, endTime, name, account, principalName, principalPhone, serviceStr, state, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId()));
+ page.setRecords(tCompanyService.getFranchiseeList(page, beginTime, endTime, name, account, principalName, principalPhone, serviceStr, state, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId()));
}
return super.packForBT(page);
}
@@ -359,6 +360,7 @@
tCompany.setEnterCode(enterCode);
tCompany.setType(2); //2：分公司
tCompany.setState(0); //0：正常
+ tCompany.setFlag("1");
tCompany.setInsertTime(new Date());
tCompany.setUpdateTime(new Date());
tCompanyService.insert(tCompany);
@@ -452,10 +454,11 @@
tCompany.setEnterCode(enterCode);
tCompany.setType(3); //2：分公司
- if (ShiroExtUtil.getUser().getRoleType() == 2) {
- tCompany.setSuperiorId(ShiroExtUtil.getUser().getObjectId());
+ if (shiroExtUtil.getUser().getRoleType() == 2) {
+ tCompany.setSuperiorId(shiroExtUtil.getUser().getObjectId());
}
tCompany.setState(0); //0：正常
+ tCompany.setFlag("1");
tCompany.setInsertTime(new Date());
tCompanyService.insert(tCompany);
--
Gitblit v1.7.1