处理权限

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

@@ -109,29 +109,36 @@
 
         <select id="selectFieldAndGrooupNumberByRoleId" resultType="com.energy.manage.service.domain.vo.cockpit.CompanyFieldGroupNumberVo">
             select
-            weg.field_code as fieldCode,
-            ANY_VALUE(wfbr.analysis_state) as analysisState,
-            count(weg.field_code) as engineGroupNumber
-            from sys_organization_auth a
-            left join wind_engine_group weg on a.code_number = weg.field_code and  weg.del_state = 0
+            soa.code_number as fieldCode,
+            weg.groupCount as engineGroupNumber,
+            wfba.analysis_state as analysisState
+            from
+            sys_organization_auth soa
+            left join
+            (select
+            field_code,
+            count(1) as groupCount
+            from
+            wind_engine_group where del_state = 0 group by field_code) weg on soa.code_number = weg.field_code
             left join
             (select
+            wfb.id,
             wfb.batch_code,
-            wfb.batch_name,
             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)) wfba on soa.code_number = wfba.field_code
             where 1=1
-            and wfb.is_delete = 0
-            order by wfb.create_time desc limit 1) wfbr
-            on a.code_number = wfbr.field_code
-            where 1=1
-            and a.role_id = #{roleId}
-            and a.code_type = 'field'
-            group by weg.field_code
+            and soa.code_type = 'field'
+            and soa.role_id = #{roleId}
         </select>