处理权限

energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -35,7 +35,6 @@
         wf.rated_capacity_number as ratedCapacityNumber,
         wf.elevation_height as elevationHeight,
         wfbr.batch_code as batchCode,
-        wfbr.batch_name as batchName,
         wfbr.analysis_state as analysisState
         from
         (select a.role_id,
@@ -50,17 +49,17 @@
         wind_field wf on soa.code_number = wf.field_code
         left join
         (select
-        wfb.batch_code,
-        wfb.batch_name,
-        wfb.field_code,
-        ar.analysis_state
-        from
-        wind_field_batch wfb
-        left join
-        analysis_result ar on wfb.batch_code = ar.batch_code
-        where 1=1
-        and wfb.is_delete = 0
-        order by wfb.create_time desc limit 1) wfbr on wf.field_code = wfbr.field_code
+         wfb.id,
+         wfb.batch_code,
+         wfb.field_code,
+         wfb.create_time,
+         ar.analysis_state
+         from
+         wind_field_batch wfb
+         left join
+         analysis_result ar on wfb.batch_code = ar.batch_code
+         where wfb.create_time in
+         (select max(create_time) from wind_field_batch group by field_code)) wfbr on wf.field_code = wfbr.field_code
         where 1=1
         </select>
 
@@ -78,7 +77,6 @@
         wf.rated_capacity_number as ratedCapacityNumber,
         wf.elevation_height as elevationHeight,
         wfbr.batch_code as batchCode,
-        wfbr.batch_name as batchName,
         wfbr.analysis_state as analysisState
         from
         (select a.role_id,
@@ -93,17 +91,17 @@
         wind_field wf on soa.code_number = wf.field_code
         left join
         (select
-        wfb.batch_code,
-        wfb.batch_name,
-        wfb.field_code,
-        ar.analysis_state
-        from
-        wind_field_batch wfb
-        left join
-        analysis_result ar on wfb.batch_code = ar.batch_code
-        where 1=1
-        and wfb.is_delete = 0
-        order by wfb.create_time desc limit 1) wfbr on wf.field_code = wfbr.field_code
+         wfb.id,
+         wfb.batch_code,
+         wfb.field_code,
+         wfb.create_time,
+         ar.analysis_state
+         from
+         wind_field_batch wfb
+         left join
+         analysis_result ar on wfb.batch_code = ar.batch_code
+         where wfb.create_time in
+         (select max(create_time) from wind_field_batch group by field_code)) wfbr on wf.field_code = wfbr.field_code
         where 1=1
         </select>