问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandDetailsVo.java

@@ -37,8 +37,8 @@ public class BaseVehicleBrandDetailsVo implements Vo {
 //    @ApiModelProperty(value = "使用组织sid：string类型")
 //    private String useOrgSid;
 
-    @ApiModelProperty(value = "使用组织sid:List类型")
-    private String[][] useOrg;
+    @ApiModelProperty(value = "使用组织sid")
+    private String useOrg;
 
     @ApiModelProperty(value = "使用组织名称，用于详情")
     private String useOrgName;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandVo.java

@@ -29,6 +29,12 @@ public class BaseVehicleBrandVo implements Vo {
     @ApiModelProperty(value = "品牌名称")
     private String brandName;
 
+    @ApiModelProperty(value = "品牌类型")
+    private String brandTypeValue;
+
+    @ApiModelProperty(value = "是否有效")
+    private String isValidity;
+
     @ApiModelProperty(value = "品牌编码")
     private String brandCode;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerService.java

@@ -354,7 +354,7 @@ public class BaseManufacturerService extends MybatisBaseService<BaseManufacturer
         if (baseManufacturer == null) {
             return rb.setMsg("该厂商不存在");
         }
-        int i = updateBySid(dto.toMap(), sid);
+        int i = updateBySid(baseManufacturerDto.toMap(), sid);
         if (i == 0) {
             return ResultBean.fireFail().setMsg("供应厂商信息修改失败");
         }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@@ -44,7 +44,7 @@
                bvb.brandTypeValue,
                bvb.manufacturerSid,
                bm.manufacturerName,
-               bvb.useOrg                   useOrgSid,
+               bvb.useOrg,
                bvb.useOrgName,
                bvb.isValidity,
                case bvb.isValidity
@@ -57,6 +57,8 @@
     <!--品牌管理分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandVo">
         SELECT bvb.sid,
+               bvb.brandTypeValue,
+               bvb.isValidity,
                bvb.brandCode,
                bvb.brandName,
                bvb.modifyTime,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@@ -138,22 +138,6 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
     public BaseVehicleBrandDetailsVo selectBySid(String sid) {
         BaseVehicleBrand baseVehicleBrand = fetchBySid(sid);
         BaseVehicleBrandDetailsVo baseVehicleBrandDetailsVo = baseMapper.selectBySid(sid);
-        if (StringUtils.isNotBlank(baseVehicleBrand.getUseOrg())) {//使用组织sid
-            //将string类型转换为List类型
-            List<String> list = Arrays.asList(baseVehicleBrand.getUseOrg().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                // s = new String[][]{list1};
-                s[i] = list1;
-            }
-            baseVehicleBrandDetailsVo.setUseOrg(s);
-        }
         return baseVehicleBrandDetailsVo;
     }