人员排序

src/main/java/com/biutag/supervision/service/SupPoliceService.java

@@ -85,7 +85,15 @@ public class SupPoliceService extends ServiceImpl<SupPoliceMapper, SupPolice> {
                 }
             }
         }
-        queryWrapper.orderByAsc("p.position_level").orderByDesc("p.position").orderByAsc("p.sort_id").orderByAsc("d.order_no").orderByAsc("p.person_status");
+        queryWrapper.orderByAsc("d.level");
+        queryWrapper.orderByAsc("p.org_id");
+        queryWrapper.orderByAsc("FIELD(IFNULL(NULLIF(p.person_type,''),'999'),'1','3','5','4','2','999')");
+        queryWrapper.orderByAsc("p.position_level");
+        queryWrapper.orderByDesc("p.position");
+        queryWrapper.orderByAsc("p.sort_id");
+        queryWrapper.orderByAsc("d.order_no");
+        queryWrapper.orderByAsc("p.person_status");
+//        queryWrapper.orderByAsc("p.position_level").orderByDesc("p.position").orderByAsc("p.sort_id").orderByAsc("d.order_no").orderByAsc("p.person_status");
         return baseMapper.queryPage(Page.of(param.getCurrent(), param.getSize()), queryWrapper);
     }