目录归属修改

src/main/java/com/zhiyun/zhiyun03/academic/service/impl/AcademicServiceImpl.java

@@ -181,8 +181,11 @@ public class AcademicServiceImpl extends ServiceImpl<AcademicMapper, Academic> i
      */
     @Override
     public int addDirectory(Directory directory) {
-        if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){
+        if (directory.getDirName().isEmpty()){
-            throw new ServiceException("400","目录名称和图片不能为空");
+            throw new ServiceException("400","目录名称不能为空");
+        }
+        if (directory.getDirImg().isEmpty()){
+            throw new ServiceException("400","图片不能为空");
         }
         QueryWrapper<Directory> qwd=new QueryWrapper<>();
         qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,6);

src/main/java/com/zhiyun/zhiyun03/application/service/impl/ApplicationServiceImpl.java

@@ -142,8 +142,11 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
      */
     @Override
     public int addDirectory(Directory directory) {
-        if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){
+        if (directory.getDirName().isEmpty()){
-            throw new ServiceException("400","目录名称和图片不能为空");
+            throw new ServiceException("400","目录名称不能为空");
+        }
+        if (directory.getDirImg().isEmpty()){
+            throw new ServiceException("400","图片不能为空");
         }
         QueryWrapper<Directory> qwd=new QueryWrapper<>();
         qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,2);

src/main/java/com/zhiyun/zhiyun03/game/service/impl/GameServiceImpl.java

@@ -169,8 +169,11 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements Ga
 
     @Override
     public int addDirectory(Directory directory) {
-        if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){
+        if (directory.getDirName().isEmpty()){
-            throw new ServiceException("400","目录名称和图片不能为空");
+            throw new ServiceException("400","目录名称不能为空");
+        }
+        if (directory.getDirImg().isEmpty()){
+            throw new ServiceException("400","图片不能为空");
         }
         QueryWrapper<Directory> qwd=new QueryWrapper<>();
         qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,5);

src/main/java/com/zhiyun/zhiyun03/knowledge/service/impl/KnowledgeServiceImpl.java

@@ -171,8 +171,11 @@ public class KnowledgeServiceImpl extends ServiceImpl<KnowledgeMapper,Knowledge>
      */
     @Override
     public int addDirectory(Directory directory) {
-        if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){
+        if (directory.getDirName().isEmpty()){
-            throw new ServiceException("400","目录名称和图片不能为空");
+            throw new ServiceException("400","目录名称不能为空");
+        }
+        if (directory.getDirImg().isEmpty()){
+            throw new ServiceException("400","图片不能为空");
         }
         QueryWrapper<Directory> qwd=new QueryWrapper<>();
         qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,7);

src/main/java/com/zhiyun/zhiyun03/textual/service/impl/TextualServiceImpl.java

@@ -175,8 +175,11 @@ public class TextualServiceImpl extends ServiceImpl<TextualMapper, Textual> impl
 
     @Override
     public int addDirectory(Directory directory) {
-        if (directory.getDirName().isEmpty() && directory.getDirImg().isEmpty()){
+        if (directory.getDirName().isEmpty()){
-            throw new ServiceException("400","目录名称和图片不能为空");
+            throw new ServiceException("400","目录名称不能为空");
+        }
+        if (directory.getDirImg().isEmpty()){
+            throw new ServiceException("400","图片不能为空");
         }
         QueryWrapper<Directory> qwd=new QueryWrapper<>();
         qwd.lambda().eq(Directory::getDirName,directory.getDirName()).eq(Directory::getDirIden,4);

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);
+            request.getSession().setAttribute("USER", login.getUserName());
-            return JsonResult.success(token);
+            return JsonResult.success(login);
         }
         return JsonResult.error(ResultCode.USER_ACCOUNT_ERROR, "账号或密码错误");
     }

src/main/resources/templates/layui-v2.6.8/index.html

@@ -1,31 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>智云</title>
+    <title>天择后台管业系统</title>
     <link rel="stylesheet" href="./layui/css/layui.css">
 </head>
 <body>
 <div class="layui-layout layui-layout-admin">
     <div class="layui-header">
         <div class="layui-logo layui-hide-xs layui-bg-black">天择后台管业系统</div>
-        <ul class="layui-nav layui-layout-right">
-            <li class="layui-nav-item layui-hide layui-show-md-inline-block">
-                <a href="javascript:;">
-                    <img src="//tva1.sinaimg.cn/crop.0.0.118.118.180/5db11ff4gw1e77d3nqrv8j203b03cweg.jpg" class="layui-nav-img">
-                    tester
-                </a>
-                <dl class="layui-nav-child">
-                    <dd><a href="login.html" onclick="logout()">退出</a></dd>
-                </dl>
-            </li>
-            <li class="layui-nav-item" lay-header-event="menuRight" lay-unselect>
-                <a href="javascript:;">
-                    <i class="layui-icon layui-icon-more-vertical"></i>
-                </a>
-            </li>
-        </ul>
     </div>
 
     <div class="layui-side layui-bg-black">