From 83ac2278a60bb9c73e0319fd5f17e915f4da362f Mon Sep 17 00:00:00 2001
From: ccsens_zhengzhichuan <ccsens_zhengzhichuan>
Date: Fri, 12 Dec 2025 14:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=91=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/client/project/GroupController.java   | 9 ++++-----
 .../main/java/com/research/system/domain/vo/GroupVO.java | 2 +-
 .../system/service/impl/KtsGroupServiceImpl.java         | 2 +-
 .../src/main/resources/mapper/dao/ClientPrjProOrgDao.xml | 4 ++--
 .../src/main/resources/mapper/dao/KtsGroupDao.xml        | 8 ++++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java
index 44bdee5f..fdc144b4 100644
--- a/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java
+++ b/research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java
@@ -1,6 +1,7 @@
 package com.research.web.controller.client.project;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
@@ -42,10 +43,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Author zzc
@@ -91,7 +89,8 @@ public class GroupController {
 //        if (query.getPageNum() > 0) {
 //            PageHelper.startPage(query.getPageNum(), query.getPageSize());
 //        }
-        return JsonResponse.ok(new PageInfo<>(ktsGroupService.childList(query.getParam())));
+        List<GroupVO.Result> results = ktsGroupService.childList(query.getParam());
+        return JsonResponse.ok(new PageInfo<>(results));
     }
 
     @PostMapping("/add")
diff --git a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java
index aecc24c8..1da22edb 100644
--- a/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java
+++ b/research-system/src/main/java/com/research/system/domain/vo/GroupVO.java
@@ -249,7 +249,7 @@ public class GroupVO {
         public static class Xl{
             private Long orgId;
             private String orgName;
-            private Integer bsh;//博士后
+            private Integer bk;//本科
             private Integer bs;//博士
             private Integer ss;//硕士
         }
diff --git a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
index 801b3c64..fd88cfea 100644
--- a/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
+++ b/research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java
@@ -89,7 +89,7 @@ public class KtsGroupServiceImpl implements KtsGroupService {
         if (CollUtil.isNotEmpty(groupList)) {
             return buildTree(groupList);
         }
-        return null;
+        return new ArrayList<>();
     }
 
     @Override
diff --git a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml
index 34d8b437..600782e9 100644
--- a/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml
+++ b/research-system/src/main/resources/mapper/dao/ClientPrjProOrgDao.xml
@@ -76,7 +76,7 @@
     <select id="lwStatistics1" resultType="com.research.system.domain.vo.ClientPrjProjInfoVo$Statistics$Lw">
         select o.id                                                                           as orgId,
                o.org_name                                                                     as orgName,
-               sum(case when a.category_id_1 = '2' then 1 else 0 end)                           as sci,
+               sum(case when a.category_id_2 = '2' then 1 else 0 end)                           as sci,
                sum(case when a.category_id_2 = '3' and category_id_2 = '1' then 1 else 0 end)   as zwqk,
                sum(case when a.category_id_2 != '2' and category_id_2 != '3' then 1 else 0 end) as qt
         from prj_proj_org o
@@ -140,7 +140,7 @@
                sum(case when a.category_id_1 = '6' then 1 else 0 end) as rcNum
         from prj_proj_org o
                  left join
-             ach_achievement a on a.proj_org_id = o.id and category_id_1 = 6
+             ach_achievement a on a.proj_org_id = o.id
         where o.del_flag = 0
         GROUP BY
             o.id
diff --git a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
index dc44306b..56ed5034 100644
--- a/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
+++ b/research-system/src/main/resources/mapper/dao/KtsGroupDao.xml
@@ -174,14 +174,14 @@
     <select id="queryXlStatistics" resultType="com.research.system.domain.vo.GroupVO$Statistics$Xl">
         select o.id as orgId,
                o.org_name      as orgName,
-               SUM(CASE WHEN m.qualification = '0' THEN 1 ELSE 0 END) AS bsh,
-               SUM(CASE WHEN m.qualification = '1' THEN 1 ELSE 0 END) AS bs,
-               SUM(CASE WHEN m.qualification = '2' THEN 1 ELSE 0 END) AS zgjs
+               SUM(CASE WHEN m.qualification = '5' THEN 1 ELSE 0 END) AS bk,
+               SUM(CASE WHEN m.qualification = '6' THEN 1 ELSE 0 END) AS ss,
+            SUM(CASE WHEN m.qualification = '7' THEN 1 ELSE 0 END) AS bs
         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
         where o.del_flag = 0
-        group by o.id,title
+        group by o.id
     </select>
 </mapper>