From 93c1d6fc320a8f234d263e24e4b4fabce89543c3 Mon Sep 17 00:00:00 2001 From: whb <17803890193@163.com> Date: Sat, 19 Aug 2023 18:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=BD=92=E5=B1=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AcademicServiceImpl.java | 7 +++++-- .../service/impl/ApplicationServiceImpl.java | 7 +++++-- .../game/service/impl/GameServiceImpl.java | 7 +++++-- .../service/impl/KnowledgeServiceImpl.java | 7 +++++-- .../service/impl/TextualServiceImpl.java | 7 +++++-- .../user/controller/UserController.java | 4 ++-- .../templates/layui-v2.6.8/index.html | 20 ++----------------- 7 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java index 751043d..ae91169 100644 --- a/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java @@ -181,8 +181,11 @@ public class AcademicServiceImpl extends ServiceImpl i */ @Override public int addDirectory(Directory directory) { - if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){ - throw new ServiceException("400","目录名称和图片不能为空"); + if (directory.getDirName().isEmpty()){ + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()){ + throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,6); diff --git a/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java index 185cf2b..3a16c6c 100644 --- a/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java @@ -142,8 +142,11 @@ public class ApplicationServiceImpl extends ServiceImpl qwd=new QueryWrapper<>(); qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,2); diff --git a/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java index e376b7c..ffcfdfc 100644 --- a/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java @@ -169,8 +169,11 @@ public class GameServiceImpl extends ServiceImpl implements Ga @Override public int addDirectory(Directory directory) { - if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){ - throw new ServiceException("400","目录名称和图片不能为空"); + if (directory.getDirName().isEmpty()){ + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()){ + throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,5); diff --git a/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java index cf6fcc6..eaa36fa 100644 --- a/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java @@ -171,8 +171,11 @@ public class KnowledgeServiceImpl extends ServiceImpl */ @Override public int addDirectory(Directory directory) { - if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){ - throw new ServiceException("400","目录名称和图片不能为空"); + if (directory.getDirName().isEmpty()){ + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()){ + throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,7); diff --git a/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java b/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java index 3e81ab8..22e9fb8 100644 --- a/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java +++ b/src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java @@ -175,8 +175,11 @@ public class TextualServiceImpl extends ServiceImpl impl @Override public int addDirectory(Directory directory) { - if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){ - throw new ServiceException("400","目录名称和图片不能为空"); + if (directory.getDirName().isEmpty()){ + throw new ServiceException("400","目录名称不能为空"); + } + if (directory.getDirImg().isEmpty()){ + throw new ServiceException("400","图片不能为空"); } QueryWrapper qwd=new QueryWrapper<>(); qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,4); diff --git a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java index 58569d1..6b4a467 100644 --- a/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java +++ b/src/main/java/com/zhiyun/zhiyun03/user/controller/UserController.java @@ -39,8 +39,8 @@ public class UserController { User login = userService.login(username, password); if (login != null) { String token = UUID.randomUUID()+""; - request.getSession().setAttribute("USER", login); - return JsonResult.success(token); + request.getSession().setAttribute("USER", login.getUserName()); + return JsonResult.success(login); } return JsonResult.error(ResultCode.USER_ACCOUNT_ERROR, "账号或密码错误"); } diff --git a/src/main/resources/templates/layui-v2.6.8/index.html b/src/main/resources/templates/layui-v2.6.8/index.html index 6c6eb1b..af9d64f 100644 --- a/src/main/resources/templates/layui-v2.6.8/index.html +++ b/src/main/resources/templates/layui-v2.6.8/index.html @@ -1,31 +1,15 @@ - + - 智云 + 天择后台管业系统
-