修复车型配置保存异常以及关联异常

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<BaseVehmodelCo
         for (Map<String, String> map : maps) {
             String modelSid = map.get("modelSid");
             String configurationItemsSid = map.get("configurationItemsSid");
-            String userSid = map.get("userSid");
-            ResultBean<String> 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("当前常用配置信息未关联当前车型，请重新选择");
             }