From d921e622f0759c4c03a203aa51adfae0aa088cd0 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 10 Apr 2023 15:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=A6=E5=9E=8B=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleModelFeign.java | 6 ++--- .../BaseVehicleModelFeignFallback.java | 4 +-- .../basemodelconfig/BaseModelConfigRest.java | 3 +++ .../BaseVehicleModelRest.java | 26 ++++++++++++++++--- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java index 6f19fbdd13..2facf830e5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeign.java @@ -88,7 +88,7 @@ public interface BaseVehicleModelFeign { @ApiOperation("删除、批量删除") @DeleteMapping("/deleteBySids") @ApiImplicitParam(name = "sids", value = "车型sid，若为多个sid，以逗号分隔") - public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid); + public ResultBean deleteBySids(@RequestParam("sids") String sids, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath); /** * 详情 @@ -107,8 +107,8 @@ public interface BaseVehicleModelFeign { * @return */ @ApiOperation("修改回显") - @GetMapping("/getAll/{sid}/{userSid}") - public ResultBean getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid); + @GetMapping("/getAll") + public ResultBean getAll(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath); /** * 快速新增回显 diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java index daa2e09577..506275b4eb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelFeignFallback.java @@ -52,7 +52,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { } @Override - public ResultBean deleteBySids(String sids, String userSid) { + public ResultBean deleteBySids(String sids, String userSid,String orgPath) { return null; } @@ -62,7 +62,7 @@ public class BaseVehicleModelFeignFallback implements BaseVehicleModelFeign { } @Override - public ResultBean getAll(String sid,String userSid) { + public ResultBean getAll(String sid,String userSid,String orgPath) { return null; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java index 456be515cb..43a9e1093c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java @@ -303,8 +303,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { return rb.setMsg("该配置已有关联车型，无法修改"); } String userSid = dto.getUserSid(); + /* ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); String sid1 = useOrgByUserSid.getData().getSid(); + */ + String sid1 = dto.getCreateOrgSId(); int i3 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid); if (i3 == 0) { return rb.setMsg("该配置不属于当前分公司，无法修改"); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java index 4466fbca40..824f0ccac0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelRest.java @@ -11,7 +11,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService; import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.PagerUtil; @@ -74,6 +74,8 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { @Autowired private SysOrganizationFeign sysOrganizationFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; @Override public ResultBean> pagerList(@RequestBody PagerQuery pagerQuery) { @@ -148,15 +150,23 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { } @Override - public ResultBean deleteBySids(String sids, String userSid) { + public ResultBean deleteBySids(String sids, String userSid,String orgPath) { List sidList = Arrays.asList(sids.split(",")); for (String sid : sidList) { int i = baseVehmodelConfigService.checkByModelSid(sid); if (i > 0) { return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除"); } + /* ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); String sid1 = useOrgByUserSid.getData().getSid(); + */ + String sid1 = ""; + if(StringUtils.isNotBlank(orgPath)){ + sid1 = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + }else{ + sid1 = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } int i1 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid); if (i1 == 0) { return ResultBean.fireFail().setMsg("该车型不属于当前分公司，无法删除"); @@ -185,7 +195,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { } @Override - public ResultBean getAll(String sid, String userSid) { + public ResultBean getAll(String sid, String userSid,String orgPath) { ResultBean rb = ResultBean.fireFail(); BaseVehicleModelSelectVo vo = baseVehicleModelService.getAll(sid); if (vo == null) { @@ -195,8 +205,16 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { if (i3 > 0) { return rb.setMsg("该车型已有关联配置，无法修改"); } + /* ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); String sid1 = useOrgByUserSid.getData().getSid(); + */ + String sid1 = ""; + if(StringUtils.isNotBlank(orgPath)){ + sid1 = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + }else{ + sid1 = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); + } int i4 = baseVehicleModelService.checkByCreateOrgAndModelSid(sid1, sid); if (i4 == 0) { return rb.setMsg("该车型不属于当前分公司，无法修改"); @@ -211,7 +229,7 @@ public class BaseVehicleModelRest implements BaseVehicleModelFeign { if (vo == null) { return rb.setMsg("该车型信息不存在"); } - ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); +// ResultBean useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); return rb.success().setData(vo); }