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

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}")
+    @GetMapping("/getAll")
-    public ResultBean<BaseVehicleModelSelectVo> getAll(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
+    public ResultBean<BaseVehicleModelSelectVo> getAll(@RequestParam("sid") String sid, @RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
 
     /**
      * 快速新增回显

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<BaseVehicleModelSelectVo> getAll(String sid,String userSid) {
+    public ResultBean<BaseVehicleModelSelectVo> getAll(String sid,String userSid,String orgPath) {
         return null;
     }
 

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<SysOrganizationVo> 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("该配置不属于当前分公司，无法修改");

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<PagerVo<BaseVehicleModelVo>> pagerList(@RequestBody PagerQuery<BaseVehicleModelQuery> 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<String> sidList = Arrays.asList(sids.split(","));
         for (String sid : sidList) {
             int i = baseVehmodelConfigService.checkByModelSid(sid);
             if (i > 0) {
                 return ResultBean.fireFail().setMsg("该车型已有关联配置，无法删除");
             }
+            /*
             ResultBean<SysOrganizationVo> 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<BaseVehicleModelSelectVo> getAll(String sid, String userSid) {
+    public ResultBean<BaseVehicleModelSelectVo> 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<SysOrganizationVo> 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<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
+//        ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid);
         return rb.success().setData(vo);
     }