From 11c9287583234783185ec2f7c13d21c90477eee9 Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Tue, 28 Apr 2026 17:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E5=A1=AB=E6=8A=A5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BsEfficiencyTaskController.java         | 10 ++++++++--
 .../efficiency/mapper/EfficiencyTaskReportMapper.xml   |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
index 7d3a9c03..04382f84 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
@@ -288,21 +288,27 @@ public class BsEfficiencyTaskController extends BladeController {
             tableColumnList.add(tableColumn);
         }
         List<LinkedHashMap<String, Object>> tableDataList = new ArrayList<>();
+        LinkedHashMap<String, LinkedHashMap<String, Object>> tableMap = new LinkedHashMap<>();
         if (!CollectionUtils.isEmpty(mapList)) {
             for (LinkedHashMap<String, Object> map : mapList) {
                 LinkedHashMap<String, Object> tableData = new LinkedHashMap<>();
                 for (Map.Entry<String, String> entry : headMap.entrySet()) {
                     tableData.put(entry.getValue(), map.get(entry.getKey()));
                 }
-                R<UserInfo> userInfoResult = userClient.userInfoByCode((String) tableData.get("employeeCode"));
+                String empployeeCode = (String) tableData.get("employeeCode");
+                R<UserInfo> userInfoResult = userClient.userInfoByCode(empployeeCode);
                 if (userInfoResult.getData() == null || userInfoResult.getData().getUser() == null || !tableData.get("employeeName").equals(userInfoResult.getData().getUser().getRealName())) {
                     tableData.put("isSysUser", "0");
                 } else {
                     tableData.put("isSysUser", "1");
                 }
-                tableDataList.add(tableData);
+                if(tableMap.containsKey(empployeeCode)){
+                    tableMap.remove(empployeeCode);
+                }
+                tableMap.put(empployeeCode, tableData);
             }
         }
+        tableDataList.addAll(tableMap.values());
         resultMap.put("tableColumn", tableColumnList);
         resultMap.put("tableData", tableDataList);
         return R.data(resultMap);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml
index f0014099..b3a26e8b 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskReportMapper.xml
@@ -91,6 +91,7 @@
                 and t.YEAR_MONTH = #{yearMonth}
             </if>
         </where>
+        ORDER BY tr.EMPLOYEE_CODE ASC
     </select>
 
 </mapper>
\ No newline at end of file