气瓶数据项调整 / 发起页调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -161,11 +161,11 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
 
         List<DictionarieValueModel> dictionarieValueModels = idxBizJgRegisterInfoService.equCategoryListByCompanyType(getSelectedOrgInfo(), equList, businessScenarios, dataSource, type);
         //bug 24467 新增历史设备--有移动式压力容器，需禁用或者删除 (历史设备录入(有证-his,无证-black))
-        if ("his".equals(dataSource)  && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
+        if ("his".equals(dataSource)  && "2000".equals(equList) && ("SB_XZ".equals(type) || "DW_LR".equals(type)) && "0".equals(businessScenarios)) {
             dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList());
         }
         // 历史无证设备录入(有证-his,无证-black))
-        if ( "black".equals(dataSource) && "2000".equals(equList) && "SB_XZ".equals(type) && "0".equals(businessScenarios)) {
+        if ( "black".equals(dataSource) && "2000".equals(equList) && ("SB_XZ".equals(type) || "DW_LR".equals(type)) && "0".equals(businessScenarios)) {
             dictionarieValueModels = dictionarieValueModels.stream().filter(dictionarieValueModel -> !dictionarieValueModel.getDictDataValue().equals("移动式压力容器")).collect(Collectors.toList());
         }
         return ResponseHelper.buildResponse(dictionarieValueModels);