From b513b2fb644deb3498ac9ada930cb84acaf8f35e Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 17 Jan 2025 13:43:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppUserAutoLoginController.java | 2 +- .../com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java index 00b78b76b..04ee43189 100644 --- a/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java +++ b/pjcloud-app-server/pjcloud-app-server-biz/src/main/java/com/bsd/pjcloud/app/controller/AppUserAutoLoginController.java @@ -188,7 +188,7 @@ public class AppUserAutoLoginController { R> userByMobile=remoteUserService.getUserByMobile(mobile); SysUser sysUser = userByMobile.getData().get(0); -// int i=8/0; + int i=8/0; UserTokenDTO userTokenDTO = new UserTokenDTO(); userTokenDTO.setSysUser(sysUser); //登录成功,根据新注册的用户信息返回token diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java index 9ff35928c..56b9695fa 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/UserExcelFaceVo.java @@ -18,13 +18,17 @@ public class UserExcelFaceVo { /** * 账号登录名没有就用手机号 */ - @ExcelProperty("用户名称") + @ExcelProperty("用户名") private String username; + + @ExcelProperty("昵称") + private String nickname; + /** * 用户真实姓名 */ - @ExcelProperty("用户昵称") + @ExcelProperty("姓名") private String name; /** @@ -36,7 +40,7 @@ public class UserExcelFaceVo { /** * 手机号码 */ - @ExcelProperty("手机号码") + @ExcelProperty("手机号") private String mobile; /** From 6089c0251e351df454f592972224b69b6b4c4d0d Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 17 Jan 2025 14:55:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pjcloud/canteen/controller/CanteenCategoryController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java index 910415dff..13108a4dc 100644 --- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java +++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenCategoryController.java @@ -139,8 +139,10 @@ public class CanteenCategoryController { @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/getAllSimple") @PreAuthorize("@pms.hasPermission('canteen_canteenCategory_view')") - public R getAllSimple(@RequestParam(value = "categoryType", required = false) String categoryType) { + public R getAllSimple(@RequestParam(value = "categoryType", required = false) String categoryType, + @RequestParam(value = "name", required = false) String name) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.like(StringUtils.isNotBlank(name), CanteenCategoryEntity::getName, name); wrapper.orderByAsc(CanteenCategoryEntity::getSort); wrapper.apply(StringUtils.isNotEmpty(categoryType), "FIND_IN_SET({0}, your_column_name)", categoryType); List list = canteenCategoryService.listScope(wrapper);