工作画像-组织支撑-培训测试平均分趋势图

airport-system/src/main/java/com/sundot/airport/system/service/impl/SysLearningGrowthServiceImpl.java

@@ -976,11 +976,11 @@ public class SysLearningGrowthServiceImpl implements ISysLearningGrowthService {
             dto.setStartDate(LargeScreenDateUtils.getDateBeforeDays(91));
         }
 
-        // 部门类型为非科室时查询全部数据
+        // 部门类型为非大队时查询全部数据
         Long deptId = dto.getDeptId();
         if (ObjUtil.isNotNull(deptId)) {
             SysDept sysDept = sysDeptService.selectDeptById(deptId);
-            if (!StrUtil.equals(DeptTypeEnum.DEPARTMENT.getCode(), sysDept.getDeptType())) {
+            if (!StrUtil.equals(DeptTypeEnum.BRIGADE.getCode(), sysDept.getDeptType())) {
                 dto.setDeptId(null);
             }
         }

airport-system/src/main/resources/mapper/system/SysLearningGrowthMapper.xml

@@ -172,9 +172,10 @@
         inner join sys_user su on su.user_name = slg.user_code
         inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
         inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
+        inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
         where 1 = 1
         <if test="deptId != null">
-            and sd_ks.dept_id=#{deptId}
+            and sd_dd.dept_id=#{deptId}
         </if>
         <if test="specifiedDate != null">
             and slg.exam_time=#{specifiedDate}