From 7732cac9da04bb75e9f655b6fd7e068e14bfc1cc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 16:06:19 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 48 +++++++++++++++++++++++-------------------------
1 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index 33a347e..9636de0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -11,9 +11,7 @@
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.service.ITCompanyCityService;
-import com.stylefeng.guns.modular.system.service.ITRegionService;
-import com.stylefeng.guns.modular.system.service.IUserService;
+import com.stylefeng.guns.modular.system.service.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.service.ITCompanyService;
import java.util.ArrayList;
import java.util.Date;
@@ -54,8 +51,8 @@
@Autowired
private ITCompanyCityService tCompanyCityService;
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
+ @Autowired
+ private ICityService cityService;
/**
* 跳转到修改平台信息
@@ -67,8 +64,9 @@
LogObjectHolder.me().set(tCompany);
//省
- List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
- model.addAttribute("provinceList",provinceList);
+ List<City> cities = cityService.selectList(null);
+// List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+ model.addAttribute("city",cities);
//系统用户对象
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 1).eq("objectId", tCompany.getId()));
@@ -101,8 +99,8 @@
*/
@RequestMapping("/tCompany_add")
public String tCompanyAdd(Model model) {
- List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
- model.addAttribute("provinceList",provinceList);
+ List<City> cities = cityService.selectList(null);
+ model.addAttribute("city",cities);
return PREFIX + "tCompany_add.html";
}
@@ -134,8 +132,8 @@
LogObjectHolder.me().set(tCompany);
//省
- List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
- model.addAttribute("provinceList",provinceList);
+ List<City> cities = cityService.selectList(null);
+ model.addAttribute("city",cities);
//系统用户对象
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
@@ -158,8 +156,8 @@
LogObjectHolder.me().set(tCompany);
//省
- List<TRegion> provinceList = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
- model.addAttribute("provinceList",provinceList);
+ List<City> cities = cityService.selectList(null);
+ model.addAttribute("city",cities);
//系统用户对象
User user = userService.selectOne(new EntityWrapper<User>().eq("roleType", 2).eq("objectId", tCompanyId));
@@ -325,20 +323,20 @@
}
//添加经营区域
public void addSocpe(String subArr,Integer id){
+ tCompanyCityService.delete(new EntityWrapper<TCompanyCity>().eq("companyId", id));
JSONArray jsonArray = JSON.parseArray(subArr);
int size = jsonArray.size();
- for (int i = 0; i < size; i++){
+ List<TCompanyCity> list = new ArrayList<>();
+ for (int i = 0; i < size; i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
- TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id));
- if (SinataUtil.isEmpty(tCompanyCity)){
- tCompanyCity = new TCompanyCity();
- tCompanyCity.setProvinceCode(jsonObject.getInteger("provinceCode"));
- tCompanyCity.setCityCode(jsonObject.getInteger("cityCode"));
- tCompanyCity.setAreaCode(jsonObject.getInteger("areaCode"));
- tCompanyCity.setCompanyId(id);
- tCompanyCity.setState(1);
- tCompanyCityService.insert(tCompanyCity);
- }
+ TCompanyCity tCompanyCity = new TCompanyCity();
+ tCompanyCity.setCityId(jsonObject.getInteger("cityId"));
+ tCompanyCity.setCompanyId(id);
+ tCompanyCity.setState(1);
+ list.add(tCompanyCity);
+ }
+ if(list.size() > 0){
+ tCompanyCityService.insertBatch(list);
}
}
--
Gitblit v1.7.1