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

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java

@@ -76,4 +76,6 @@ public class BaseVehmodelConfigDto implements Dto {
 	private Integer isCommonModel;
 	@ApiModelProperty(value = "内部编码")
 	private String insideCode;
+
+	private String orgPath;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -75,7 +75,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     public ResultBean save(BaseModelConfigDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String userSid = dto.getUserSid();
-        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+//        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
@@ -162,7 +162,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         configName = baseModelConfigService.configNameSpell(entity);
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
-        List<String> stringList = baseModelConfigService.checkByConfigName(sid);
+        List<String> stringList = baseModelConfigService.checkByConfigName(dto.getCreateOrgSId());
         if (stringList != null || stringList.size() > 0){
             for (String s : stringList) {
                 if (configName.equals(s)){
@@ -170,7 +170,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
                 }
             }
         }
-        entity.setCreateOrgSId(sid);
+//        entity.setCreateOrgSId(sid);
         // 配置编码
         int i1 = baseModelConfigService.selectCount();
         String num = String.format("%04d", i1 + 1); // 不足4位补0

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -37,7 +37,6 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 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.service.MybatisBaseService;
@@ -440,7 +439,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         for (BaseVehmodelConfigDto baseVehmodelConfigDto : dto) {
             String modelSid = baseVehmodelConfigDto.getModelSid();
             String configurationItemsSid = baseVehmodelConfigDto.getConfigurationItemsSid();
-            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
+//            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
+            ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(baseVehmodelConfigDto.getOrgPath());
             if ("0".equals(resultBean.getData())) {
                 return rb.setMsg("该用户无分公司，不允许操作");
             }
@@ -452,9 +452,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             String sid = baseVehmodelConfig.getSid();
             BeanUtil.copyProperties(dto, baseVehmodelConfig);
             baseVehmodelConfig.setSid(sid);
-            ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(baseVehmodelConfigDto.getUserSid());
-            String orgSid = useOrgByUserSid.getData().getSid();
-            baseVehmodelConfig.setUseOrgSid(orgSid);
+//            ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(baseVehmodelConfigDto.getUserSid());
+//            String orgSid = useOrgByUserSid.getData().getSid();
+            baseVehmodelConfig.setUseOrgSid(resultBean.getData());
             baseVehmodelConfig.setModelSid(modelSid);
             baseVehmodelConfig.setConfigurationItemsSid(configurationItemsSid);
             save(baseVehmodelConfig);