绩效填报调整

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);

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>