cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -1227,8 +1227,15 @@ @RequestMapping("/store") public String store(Model model) { Integer objectType = UserExt.getUser().getObjectType(); List<TStore> list = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getState, 1)); model.addAttribute("list",list); List<TStore> tStores = new ArrayList<>(); if (objectType == 2){ tStores = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getState, 1).eq(TStore::getOperatorId,UserExt.getUser().getObjectId())); } if (objectType == 3){ tStores = storeService.list(new LambdaQueryWrapper<TStore>().eq(TStore::getState, 1).eq(TStore::getId,UserExt.getUser().getObjectId())); } model.addAttribute("list",tStores); model.addAttribute("objectType",objectType); model.addAttribute("objectId",UserExt.getUser().getObjectId()); return PREFIX + "storeIncome.html"; cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -23,6 +23,7 @@ import com.dsh.guns.modular.system.util.HttpRequestUtil; import io.swagger.models.auth.In; import org.apache.poi.ss.formula.functions.T; import org.bouncycastle.math.raw.Mod; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -100,12 +101,26 @@ */ @RequestMapping("/tShop_add") public String tCompetitionAdd(Model model) { List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); model.addAttribute("list",list); String roleid = UserExt.getUser().getRoleid(); model.addAttribute("role",roleid); List<TOperator> list1 = tOperatorService.list(); if (UserExt.getUser().getObjectType()==2){ // 查询这个运营商管理的省 TOperator id = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("id", UserExt.getUser().getObjectId())); if (id.getType()==1){ // 全国 List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); model.addAttribute("list",list); }else{ // 找到他管理的省 List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("operatorId", UserExt.getUser().getObjectId()).eq("pid", 0)); model.addAttribute("list",list); } }else{ List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); model.addAttribute("list",list); } // if (!roleid.equals("1")){ TOperator operator1 = tOperatorService.getOne(new QueryWrapper<TOperator>().eq("userId", UserExt.getUser().getId())); @@ -117,8 +132,35 @@ // } model.addAttribute("yysList",list1); model.addAttribute("objectType",UserExt.getUser().getObjectType()); return PREFIX + "TShop_add.html"; } // 运营商根据省筛选市区 @RequestMapping("/getCityYys") @ResponseBody public Object getCityYys(String province) { Integer objectId = UserExt.getUser().getObjectId(); // todo // 通过选择的省 获取管理的市 TOperatorCity byId = operatorCityService.getOne(new QueryWrapper<TOperatorCity>() .eq("code",province).eq("operatorId",objectId)); List<TOperatorCity> list = operatorCityService.list(new QueryWrapper<TOperatorCity>() .eq("pid", province).eq("operatorId", UserExt.getUser().getObjectId())); if (list.size() == 0){ // 管理整个省 获取这个省下的所有市 List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); // 拿到省的id TCity code = cityService.getOne(new QueryWrapper<TCity>().eq("code", byId.getCode())); // 获取省下面的所有市 return cityService.list(new QueryWrapper<TCity>().eq("parent_id", code.getId())); }else{ // 没有管理整个省 获取对应的市 return list; } } @RequestMapping("/tShop_add_one") public String tCompetitionAddOne(Integer id,Model model) { List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0)); cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html
@@ -46,6 +46,7 @@ <div class="form-horizontal" id="carInfoForm"> <input hidden id="role" value="${role}"> <input hidden id="objectType" value="${objectType}"> @if(role=='1'){ <div class="form-group"> <label class="col-sm-3 control-label">门店类型:</label> cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js
@@ -639,24 +639,29 @@ * 选择分公司后执行 */ TCarInfoDlg.oneChange = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择市</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; if ($("#objectType").val()==2){ }else{ var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", function(data){ if(data!=null){ if(language==1){ var content='<option value="">选择市</option>'; }else if(language==2){ var content='<option value="">Choose your franchisee</option>'; }else { var content='<option value="">Pilih franchisee Anda</option>'; } $.each(data, function(k,v) { content += "<option value='"+v.code+"'>"+v.name+"</option>"; }); $("#cCode1").empty().append(content); } $.each(data, function(k,v) { content += "<option value='"+v.code+"'>"+v.name+"</option>"; }); $("#cCode1").empty().append(content); } }); ajax.set("oneId",oneId); ajax.start(); }); ajax.set("oneId",oneId); ajax.start(); } } /**