diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java index 2acf2c87..f9280576 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserAppController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "App*用户信息") @RestController @RequestMapping(value = "/app/user") +@CrossOrigin(origins = "*") public class TbUserAppController { @Autowired diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java index 840cb0d4..3b31376f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/TbUserSingleAppController.java @@ -119,6 +119,7 @@ public class TbUserSingleAppController { PageHelper.startPage(pageNum, pageSize); List list = tbUserSingleService.lambdaQuery() .ne(ObjectUtil.isNotEmpty(notExcludeSex), TbUserSingle::getSex, notExcludeSex) + .orderByDesc(TbUserSingle::getStatus) .list(); list.forEach(model->{ //填充年纪