Explorar o código

外勤考勤统计排序修改

xiao547607 %!s(int64=4) %!d(string=hai) anos
pai
achega
23f204c412

+ 1 - 0
common/src/main/resources/mapper/base/PersonInfo.xml

@@ -241,6 +241,7 @@
                 LEFT JOIN base_company_info b ON b.id_ = a.company_id
                 LEFT JOIN base_person_popedom c ON c.id_ = a.popedom_
                 LEFT JOIN base_person_role_info d ON d.id_ = c.person_role_id
+                LEFT JOIN base_hq_person g ON a.id_ = g.person_id
 		]]>
         <where>
                 a.del_flag = 0

+ 1 - 1
web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -436,7 +436,7 @@ public class WorkScheduleAttendanceController {
             Map<String, Object> msgMap = new HashMap<>();
 
             List<Sort> sortList = new ArrayList<>();
-            sortList.add(new Sort("a.id_", "asc"));
+            sortList.add(new Sort("g.sort_no", "asc"));
 
             if (StringUtils.isNotEmpty(name)) {
                 String[] names = name.split(",");