修改了权限

xiaoan-dao/src/main/java/com/xiaoan/dao/backend/IssueRepository.java

@@ -22,7 +22,7 @@ public interface IssueRepository extends IBaseRepository<IssueEntity, Long> {
      * 关联查询
      */
 
-    @Select(value = "select l.title, l.content, l.create_time, u.user_name, u.real_name from tb_issue l left join tb_user u on l.user_id = u.id " +
+    @Select(value = "select l.id, l.title, l.content, l.create_time, u.user_name, u.real_name from tb_issue l left join tb_user u on l.user_id = u.id " +
             "where (u.user_name like #{itemName} or #{itemName} is null) " +
             "or (u.real_name like #{itemName} or #{itemName} is null) " +
             "or (l.title like #{itemName} or #{itemName} is null) " +
@@ -30,7 +30,7 @@ public interface IssueRepository extends IBaseRepository<IssueEntity, Long> {
             "order by create_time desc")
     List<IssueResponse> search(String itemName);
 
-    @Select(value = "select l.title, l.content, l.create_time, u.user_name, u.real_name from tb_issue l left join tb_user u on l.user_id = u.id " +
+    @Select(value = "select l.id, l.title, l.content, l.create_time, u.user_name, u.real_name from tb_issue l left join tb_user u on l.user_id = u.id " +
             "where ((u.user_name like #{itemName} or #{itemName} is null) " +
             "or (u.real_name like #{itemName} or #{itemName} is null) " +
             "or (l.title like #{itemName} or #{itemName} is null) " +

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/RoleRequest.java

@@ -3,6 +3,7 @@ package com.xiaoan.domain.dto.request;
 import com.xiaoan.common.model.PageDto;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.Set;
 
 /**
@@ -18,6 +19,7 @@ public class RoleRequest {
     // 描述
     private String roleDesc;
 
+    @NotNull
     private String roleKey;
 
     // 资源id

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/UserRequest.java

@@ -3,6 +3,7 @@ package com.xiaoan.domain.dto.request;
 import lombok.Data;
 
 import javax.validation.constraints.Email;
+import javax.validation.constraints.NotNull;
 
 /**
  * Created by owen on 2020/2/18 0018 17:09
@@ -12,6 +13,7 @@ public class UserRequest{
 
     private Long id;
 
+    @NotNull
     private String userName;
 
     private String realName; // 真实姓名
@@ -19,6 +21,7 @@ public class UserRequest{
     /**
      * 用户代号
      */
+    @NotNull
     private String userNum;
 
     private int sex; // 0:男  1：女
@@ -26,6 +29,7 @@ public class UserRequest{
     @Email
     private String email;
 
+    @NotNull
     private Long departmentId; //部门
 
     private Long roleId; // 角色id

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/response/IssueResponse.java

@@ -25,12 +25,6 @@ public class IssueResponse implements Serializable {
 
     private Date createTime;
 
-//    /**
-//     * 操作者用户
-//     */
-//    private Long userId;
-
-
     private String title;
 
 

xiaoan-web/src/main/java/com/xiaoan/web/aop/WebLogAspect.java

@@ -51,7 +51,7 @@ public class WebLogAspect {
 
 
         // 记录下请求内容
-        log.info("request URL : {}" , request.getRequestURL().toString());
+//        log.info("request URL : {}" , request.getRequestURL().toString());
         log.info("request Method : {}" , request.getMethod());
         log.info("request IP : {}" , request.getRemoteAddr());
         log.info("request Args : {}" , Arrays.toString(joinPoint.getArgs()));

xiaoan-web/src/main/java/com/xiaoan/web/backend/IndexController.java

@@ -88,8 +88,8 @@ public class IndexController {
         tokenMap.put("role", roles);
 
 
-//        String token = JwtUtil2.createJWT(-1, tokenMap);
-        String token = JwtUtil2.createJWT(tokenExpire, tokenMap);
+        String token = JwtUtil2.createJWT(-1, tokenMap);
+//        String token = JwtUtil2.createJWT(tokenExpire, tokenMap);
 //
 
         HashMap<String, Object> result = new HashMap<>();

xiaoan-web/src/main/java/com/xiaoan/web/backend/IssueController.java

@@ -13,6 +13,7 @@ import com.xiaoan.service.backend.IssueService;
 import com.xiaoan.service.backend.LogService;
 import com.xiaoan.web.aop.WebControllerLog;
 import com.xiaoan.web.shiro.JWTUtil;
+import com.xiaoan.web.shiro.JwtUtil2;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.Logical;
@@ -72,7 +73,7 @@ public class IssueController extends BaseController {
     public ResultJson save(@RequestBody IssueRequest param){
         IssueEntity issueEntity = new IssueEntity();
         BeanUtils.copyProperties(param, issueEntity);
-        Long userId = JWTUtil.getUserId(getToken());
+        Long userId = JwtUtil2.getUserId(getToken());
         issueEntity.setUserId(userId);
         issueService.save(issueEntity);
         return new ResultJson(MsgCode.SUCCESS_CODE, MsgCode.SUCCESS_MSG);

xiaoan-web/src/main/java/com/xiaoan/web/backend/RoleController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 import tk.mybatis.mapper.entity.Condition;
 
+import javax.validation.Valid;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -131,7 +132,7 @@ public class RoleController extends BaseController {
     @RequiresPermissions(value="admin:role:add")
     @ApiOperation("新增或修改角色信息")
     @PostMapping("save")
-    public ResultJson save(@RequestBody RoleRequest param){
+    public ResultJson save(@Valid @RequestBody RoleRequest param){
 
         RoleEntity roleEntity = null;
         int n = 0;