From 8e307d1b63d4454b99568a1339aea12049933c40 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Mon, 10 Apr 2023 16:41:42 +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 --- .../BaseVehmodelConfigService.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 11cf849aba..9c2b152076 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -467,12 +467,18 @@ public class BaseVehmodelConfigService extends MybatisBaseService map : maps) { String modelSid = map.get("modelSid"); String configurationItemsSid = map.get("configurationItemsSid"); - String userSid = map.get("userSid"); - ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid); - if ("0".equals(resultBean.getData())) { - return rb.setMsg("该用户无分公司，不允许操作"); + String userSid = map.get("userSid"); + String orgPath = map.get("orgPath"); + String useOrgSid = ""; + if(StringUtils.isNotBlank(orgPath)){ + useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + }else{ + useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } - BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, resultBean.getData()); + if ("0".equals(useOrgSid)) { + return rb.setMsg("该用户无分公司，不允许操作"); + } + BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid, useOrgSid); if (vo == null) { return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择"); }