Commit aa2cf5f1 authored by 刘林's avatar 刘林

fix(JG):气瓶导入功能开发Bug修改

parent f9a0bf4b
...@@ -80,7 +80,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin ...@@ -80,7 +80,9 @@ public class PressureVesselListener extends AnalysisEventListener<EquipInfoCylin
} }
checkNotBlank(data.getWhetherVehicleCylinder(), "是否车用气瓶不能为空"); checkNotBlank(data.getWhetherVehicleCylinder(), "是否车用气瓶不能为空");
checkNotBlank(data.getEquCodeType(), "是否有设备代码不能为空"); checkNotBlank(data.getEquCodeType(), "是否有设备代码不能为空");
checkNotBlank(data.getEquCode(), "设备代码不能为空"); if ("1".equals(data.getEquCodeType())) {
checkNotBlank(data.getEquCode(), "设备代码不能为空");
}
if ("1".equals(data.getEquCodeType()) && equCodeList.contains(data.getEquCode())) { if ("1".equals(data.getEquCodeType()) && equCodeList.contains(data.getEquCode())) {
result.append("设备代码不能重复;"); result.append("设备代码不能重复;");
} }
......
...@@ -640,9 +640,8 @@ public class RemoteSecurityService { ...@@ -640,9 +640,8 @@ public class RemoteSecurityService {
List<PermissionModel> dictionarieModel = null; List<PermissionModel> dictionarieModel = null;
FeignClientResult feignClientResult; FeignClientResult feignClientResult;
try { try {
feignClientResult = Privilege.permissionClient.treeByRole(id, appType, null, null); feignClientResult = Privilege.permissionClient.treeByRole(id,appType, null, null, RequestContext.getAppKey());
dictionarieModel = (List<PermissionModel>) feignClientResult.getResult(); dictionarieModel = (List<PermissionModel>) feignClientResult.getResult();
} catch (InnerInvokException e) { } catch (InnerInvokException e) {
e.printStackTrace(); e.printStackTrace();
} }
......
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