|
@@ -111,7 +111,7 @@ public class SysUserController {
|
|
|
//根据公司id过滤
|
|
|
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
|
|
|
queryWrapper.lambda().like(SysUser::getPkOrg,sysUser.getOrgCode());
|
|
|
- queryWrapper.orderByAsc("create_time");
|
|
|
+ queryWrapper.last("order by substring_index(work_no, '-', 1) + 0 asc,work_no asc");
|
|
|
|
|
|
if(StringUtils.isNotBlank(deptName)){
|
|
|
SysUser user2 = new SysUser();
|