修改工作人员学历统计bug

research-system/src/main/resources/mapper/dao/KtsGroupDao.xml

@@ -160,13 +160,13 @@
         prj_proj_org o
         left join
         kts_kt_group g on g.proj_org_id = o.id
-        left join kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0
+        left join kts_kt_group_member m on m.kt_group_id = g.id
         left join sys_user u on u.user_id = m.user_id and u.del_flag = 0
         left join sys_dict_data d1 on d1.dict_value = m.qualification and d1.dict_type = 'qualification'
         left join sys_dict_data d2 on d2.dict_value = m.title and d2.dict_type = 'sys_title'
         left join sys_user u1 on u1.user_name = m.create_by
         where
-        o.del_flag = 0
+        o.del_flag = 0 and m.del_flag = 0
         <if test="dto.projOrgId != null">
             and g.proj_org_id = #{dto.projOrgId}
         </if>
@@ -241,7 +241,7 @@
         from prj_proj_org o
                  left join
              kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0
-                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0 and m.category = 1
+                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0
         where o.del_flag = 0
         group by o.id
     </select>
@@ -269,7 +269,7 @@
         from prj_proj_org o
                  left join
              kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0
-                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id
+                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0
         where o.del_flag = 0
         group by o.id
     </select>
@@ -297,7 +297,7 @@
         from prj_proj_org o
                  left join
              kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0
-                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.graduation_time &lt; now()
+                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.graduation_time &lt; now() and m.del_flag = 0
         where o.del_flag = 0
         group by o.id
     </select>
@@ -376,7 +376,7 @@
         from prj_proj_org o
                  left join
              kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0
-                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id
+                 LEFT JOIN kts_kt_group_member m on m.kt_group_id = g.id and m.del_flag = 0
         where o.del_flag = 0
         group by o.id
     </select>