问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerQuery.java

@@ -51,8 +51,8 @@ public class BaseTrailerQuery implements Query {
 
 	@ApiModelProperty("挂车车架号")
 	private String vinNo;
-	@ApiModelProperty("车辆品牌sid")
-    private String carBrand; // 车辆品牌sid
+	@ApiModelProperty("车辆品牌名称")
+    private String carBrandName; // 车辆品牌名称
 	@ApiModelProperty("车辆型号")
 	private String carModelName; // 车辆型号
 	@ApiModelProperty("厂商sid")

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -98,8 +98,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getVinNo())) {
             qw.like("bt.vinNo", query.getVinNo());
         }
-        if (StringUtils.isNotBlank(query.getCarBrand())) {
-            qw.eq("btm.brandSid", query.getCarBrand());
+        if (StringUtils.isNotBlank(query.getCarBrandName())) {
+            qw.eq("btm.brandName", query.getCarBrandName());
         }
         if (StringUtils.isNotBlank(query.getSettlementSid())) {
             qw.eq("btm.manufacturerSid", query.getSettlementSid());

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -146,14 +146,14 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         sysOrganizationService.updateBySid(dto.toMap(), sid);
         //修改金蝶组织信息
         List<OrgOrganizations> orgOrganizationsList = new ArrayList<>();
-        if ("0".equals(dto.getIsDept())){
+        if (0 == dto.getIsDept()){
             OrgOrganizations orgOrganizations = new OrgOrganizations();
             orgOrganizations.setFName(dto.getName());
             orgOrganizations.setFNumber(dto.getOrgCode());
             orgOrganizations.setFOrgFormID("102");
             orgOrganizationsList.add(orgOrganizations);
             finKingDeeFeign.updateOrgOrganizations(orgOrganizationsList);
-        }else if ("1".equals(dto.getIsDept())){
+        }else if (1 == dto.getIsDept()){
             BdDepartment bdDepartment = new BdDepartment();
             bdDepartment.setFName(dto.getName());
             bdDepartment.setFNumber(dto.getOrgCode());

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -267,13 +267,13 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
         this.saveOrUpdate(entity);
         //推送金蝶组织信息
-        if ("0".equals(entity.getIsDept())) {
+        if (0 == entity.getIsDept()) {
             OrgOrganizations orgOrganizations = new OrgOrganizations();
             orgOrganizations.setFName(entity.getName());
             orgOrganizations.setFNumber(entity.getOrgCode());
             orgOrganizations.setFOrgFormID("102");
             finKingDeeFeign.draftOrgOrganizations(orgOrganizations);
-        } else if ("1".equals(entity.getIsDept())) {
+        } else if (1 == entity.getIsDept()) {
             BdDepartment bdDepartment = new BdDepartment();
             bdDepartment.setFName(entity.getName());
             bdDepartment.setFNumber(entity.getOrgCode());