Browse Source

修复排产车型选择、修复角色的列表添加组织层级

master
dimengzhe 3 years ago
parent
commit
b19e827c26
  1. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
  2. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java

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

@ -575,11 +575,13 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
String[] sidList = query.getSidList();
if (sidList.length > 0) {
List<String> stringList = Arrays.asList(sidList);
qw.ne("bvc.modelSid", stringList.get(0)).ne("bvc.configurationItemsSid", stringList.get(1));
if (stringList.size() > 0) {
qw.notIn("bvc.sid", stringList);
}
}
if (StringUtils.isNotBlank(query.getVehicleStateValue())) {
qw.eq("bv.vehicleStateValue", query.getVehicleStateValue());
qw.eq("bv.createOrg", query.getUseOrgSid());
qw.eq("bv.useOrg", query.getUseOrgSid());
}
if (StringUtils.isNotBlank(query.getVehicleAlias())) {
qw.like("bvm.vehicleAlias", query.getVehicleAlias());

2
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java

@ -42,4 +42,6 @@ public class SysRoleVo implements Vo {
private String postSid;
@ApiModelProperty("岗位名称")
private String postName;
@ApiModelProperty(value = "组织层级")
private String roleTypeValue;
}

Loading…
Cancel
Save