Commit f31743a6 authored by KeYong's avatar KeYong

修改bug

parent 76735089
...@@ -181,7 +181,7 @@ public class KeySiteController extends BaseController { ...@@ -181,7 +181,7 @@ public class KeySiteController extends BaseController {
@RequestParam(required = false) String fireEnduranceRate, @RequestParam(required = false) String fireEnduranceRate,
@RequestParam(required = false) String useNature, @RequestParam(required = false) String useNature,
@RequestParam(required = false) String fireFacilitiesInfo, @RequestParam(required = false) String fireFacilitiesInfo,
@RequestParam String bizOrgCode) { @RequestParam(required = false) String bizOrgCode) {
Page<KeySiteDto> page = new Page<KeySiteDto>(); Page<KeySiteDto> page = new Page<KeySiteDto>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
......
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
FROM FROM
wl_stock_detail wl_stock_detail
) AS detail ON detail.equipment_specific_id = spec.id ) AS detail ON detail.equipment_specific_id = spec.id
LEFT JOIN wl_warehouse_structure structure ON detail.warehouse_structure_id = structure.id LEFT JOIN wl_warehouse_structure structure ON spec.warehouse_structure_id = structure.id
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
s.id, s.id,
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS code, MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS code,
MAX( CASE WHEN a.field_name = 'isRisk' THEN a.field_value END ) AS isRisk, MAX( CASE WHEN a.field_name = 'isRisk' THEN a.field_value END ) AS isRisk,
MAX( CASE WHEN a.field_name = 'address' THEN a.field_value END ) AS address, MAX( CASE WHEN a.field_name = 'address' THEN a.field_value END ) AS address,
MAX( CASE WHEN a.field_name = 'bizOrgCode' THEN a.field_value END ) AS bizOrgCode, MAX( CASE WHEN a.field_name = 'orgCode' THEN a.field_value END ) AS bizOrgCode,
MAX( CASE WHEN a.field_name = 'bizOrgName' THEN a.field_value END ) AS bizOrgName MAX( CASE WHEN a.field_name = 'bizOrgName' THEN a.field_value END ) AS bizOrgName
FROM FROM
`wl_form_instance` a `wl_form_instance` a
......
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