Commit ee75a966 authored by zhangsen's avatar zhangsen

运维概览页面 岗位 蓝色背景bug

parent 6eaec4dc
...@@ -555,9 +555,15 @@ public class InputItemController extends AbstractBaseController { ...@@ -555,9 +555,15 @@ public class InputItemController extends AbstractBaseController {
if (param.getEquipmentType() == null && param.getCustomType() == null&&param.getFacilitiesType() == null&&param.getKeyPartsType() == null){ if (param.getEquipmentType() == null && param.getCustomType() == null&&param.getFacilitiesType() == null&&param.getKeyPartsType() == null){
throw new BadRequest("适用类型至少需选择一项"); throw new BadRequest("适用类型至少需选择一项");
} }
if (CollectionUtils.isNotEmpty(inputItemDao.findByItemNo(param.getItemNo()))) {
throw new BadRequest("该编号已存在,请重新输入");
}
if (CollectionUtils.isNotEmpty(inputItemDao.findByItemName(param.getName()))) { if (CollectionUtils.isNotEmpty(inputItemDao.findByItemName(param.getName()))) {
throw new BadRequest("该名称已存在,请重新输入"); throw new BadRequest("该名称已存在,请重新输入");
} }
//如果为1则为否,顺应机场逻辑 //如果为1则为否,顺应机场逻辑
param.setCustomType("1".equals(param.getCustomType()) ? null : param.getCustomType()); param.setCustomType("1".equals(param.getCustomType()) ? null : param.getCustomType());
param.setKeyPartsType("1".equals(param.getKeyPartsType()) ? null : param.getKeyPartsType()); param.setKeyPartsType("1".equals(param.getKeyPartsType()) ? null : param.getKeyPartsType());
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
sys.design_org, sys.design_org,
sys.lead_designer, sys.lead_designer,
sys.design_org_telephone, sys.design_org_telephone,
wec.code as categoryCode,
(select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount, (select count(1) from `wl_equipment_specific` es where find_in_set(sys.id,es.system_id) and es.single = true ) equipCount,
wws.full_name as fullName wws.full_name as fullName
from from
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment