Merge remote-tracking branch 'origin/master'

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java

@@ -97,6 +97,7 @@ public class EquipmentController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@Operation(summary = "分页", description  = "")
 	@Parameters({
+			@Parameter(name = "id", description = "设备ID", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")),
 			@Parameter(name = "deviceCode", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 			@Parameter(name = "deviceName", description = "设备名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 			@Parameter(name = "category", description = "设备分类", in = ParameterIn.QUERY, schema = @Schema(type = "string")),

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/EquipmentMapper.xml

@@ -44,6 +44,9 @@
         wc.WC_NAME as workCenterName
         from MES_EQUIPMENT e LEFT JOIN BS_WORK_CENTER wc ON e.WORK_CENTER_ID = wc.ID
         WHERE e.IS_DELETED = 0
+        <if test="equipment.id != null and equipment.id != ''">
+            AND e.ID = #{equipment.id}
+        </if>
         <if test="equipment.deviceCode != null and equipment.deviceCode != ''">
             AND e.DEVICE_CODE LIKE CONCAT('%', CONCAT(#{equipment.deviceCode}, '%'))
         </if>