导出排序

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -655,12 +655,13 @@ public class SysUserController {
         if(!oConvertUtils.isEmpty(selections)){
            queryWrapper.in("id",selections.split(","));
         }
-        queryWrapper.notIn("sy_hire_type","离职");
-        if(StringUtils.isNotBlank(address)){
-            queryWrapper.orderByAsc("work_no");
-        }else{
-            queryWrapper.orderByAsc("create_time");
-        }
+//        queryWrapper.notIn("sy_hire_type","离职");
+
+//        if(StringUtils.isNotBlank(address)){
+//            queryWrapper.orderByAsc("work_no");
+//        }else{
+//            queryWrapper.orderByAsc("create_time");
+//        }
         if(StringUtils.isNotBlank(deptName)){
             SysUser user2 = new SysUser();
             user2.setDeptName(deptName);
@@ -675,6 +676,7 @@ public class SysUserController {
             }
 
         }
+        queryWrapper.last("and IFNULL(sy_Hire_Type,'在职') !='离职' order by substring_index(work_no, '-', 1) + 0 asc,work_no asc");
         //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
         List<SysUser> pageList = sysUserService.list(queryWrapper);
         List<SysUserAddress> pageList2 = new ArrayList<>();