ytslOA-server.git

			@@ -68,6 +68,8 @@
			List<SysDictData> dict3 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT103").orderByAsc(SysDictData::getDictSort));
			// 采集周期
			List<SysDictData> dict7 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT107").orderByAsc(SysDictData::getDictSort));
			//在用状态
			List<SysDictData> dict4 = dictDataService.list(new QueryWrapper<SysDictData>().lambda().eq(SysDictData::getDictType, "DICT104").orderByAsc(SysDictData::getDictSort));
			// 外设单元
			List<DevPeripheralUnit> peripheralUnit = iDevPeripheralUnitService.list(new QueryWrapper<DevPeripheralUnit>());
			//外设厂商
			@@ -80,6 +82,7 @@
			map.put("DICT101", dict1);
			map.put("DICT102", dict2);
			map.put("DICT103", dict3);
			map.put("DICT104", dict4);
			map.put("DICT107", dict7);
			map.put("peripheralUnit", peripheralUnit);
			map.put("peripheralFirm", peripheralFirm);

			@@ -189,6 +189,10 @@
			if(StringUtils.isNotBlank(bo.getEdition())){
			po.setEdition(bo.getEdition());
			}
			if(StringUtils.isNotBlank(bo.getUseStatus()))
			{
			po.setUseStatus(bo.getUseStatus());
			}
			// if (StringUtils.isEmpty(bo.getNetworkId())) {
			// po.setNetworkId(bo.getNetworkId());
			// }
			@@ -218,6 +222,10 @@
			if (StringUtils.isNotBlank(bo.getRemarks())) {
			po.setRemarks(bo.getRemarks());
			}
			if(StringUtils.isNotBlank(bo.getUseStatus()))
			{
			po.setUseStatus(bo.getUseStatus());
			}
			baseMapper.updateById(po);
			}
			}

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/ExternaController.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/DevEquipmentServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史