bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MetaObjectHandlerConfig.java

 package cn.wisenergy.chnmuseum.party.common.mybatis;
 
+import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
+import cn.wisenergy.chnmuseum.party.model.TUser;
+import cn.wisenergy.chnmuseum.party.service.TUserService;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.subject.Subject;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 
 /**
@@ -14,6 +20,9 @@ import java.time.LocalDateTime;
 @Component
 public class MetaObjectHandlerConfig implements MetaObjectHandler {
 
+    @Resource
+    private TUserService userService;
+
     @Override
     public void insertFill(MetaObject metaObject) {
         LocalDateTime now = LocalDateTime.now();
@@ -26,11 +35,15 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
             this.setFieldValByName("updateTime", now, metaObject);
         }
         this.setFieldValByName("version", 1, metaObject);
-        // 创建人
-//        Principal currentUser = getCurrentUser();
-//        this.setFieldValByName("creatorId", currentUser.getId(), metaObject);
-        this.setFieldValByName("userId", "1", metaObject);
-//        this.setFieldValByName("creatorName", currentUser.getLoginName(), metaObject);
+
+        final TUser currentUser = getCurrentUser();
+        if (currentUser != null) {
+            final String userName = JwtTokenUtil.getUsername(currentUser.getJwtToken());
+            final TUser user = this.userService.selectByUsername(userName);
+            this.setFieldValByName("userId", user.getId(), metaObject);
+            this.setFieldValByName("userName", user.getUserName(), metaObject);
+            this.setFieldValByName("orgName", user.getOrgName(), metaObject);
+        }
     }
 
     @Override
@@ -40,9 +53,14 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
         if (updateTime == null) {
             this.setFieldValByName("updateTime", now, metaObject);
         }
-        //操作人
-//        this.setFieldValByName("createId", 111L, metaObject);
-//        this.setFieldValByName("modifierBy", 111L, metaObject);
+        final TUser currentUser = getCurrentUser();
+        if (currentUser != null) {
+            final String userName = JwtTokenUtil.getUsername(currentUser.getJwtToken());
+            final TUser user = this.userService.selectByUsername(userName);
+            this.setFieldValByName("userId", user.getId(), metaObject);
+            this.setFieldValByName("userName", user.getUserName(), metaObject);
+            this.setFieldValByName("orgName", user.getOrgName(), metaObject);
+        }
     }
 
     /*
@@ -50,16 +68,12 @@ public class MetaObjectHandlerConfig implements MetaObjectHandler {
      *
      * @return 用户对象
      */
-//    private Principal getCurrentUser() {
-//        Subject subject = SecurityUtils.getSubject();
-//        if (subject != null) {
-//            Principal user = (Principal) subject.getPrincipal();
-//            if (user != null) {
-//                return user;
-//            }
-//        }
-//        return null;
-//        return new Principal(1L, "admin");
-//    }
+    private TUser getCurrentUser() {
+        Subject subject = SecurityUtils.getSubject();
+        if (subject != null) {
+            return (TUser) subject.getPrincipal();
+        }
+        return null;
+    }
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/TUser.java

@@ -2,29 +2,18 @@ package cn.wisenergy.chnmuseum.party.model;
 
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import java.util.List;
-
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -46,6 +35,15 @@ public class TUser implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public TUser(String id, String jwtToken) {
+        this.id = id;
+        this.jwtToken = jwtToken;
+    }
+
+    public TUser(String jwtToken) {
+        this.jwtToken = jwtToken;
+    }
+
     @ApiModelProperty("用户标识")
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     @NotNull(message = "用户标识ID不能为空", groups = {Update.class})
@@ -53,66 +51,66 @@ public class TUser implements Serializable {
 
     @ApiModelProperty("用户名")
     @TableField("user_name")
-        @NotBlank(message = "用户名不能为空", groups = {Add.class, Update.class})
-        private String userName;
-    
+    @NotBlank(message = "用户名不能为空", groups = {Add.class, Update.class})
+    private String userName;
+
     @TableField("password_hash")
-        @NotNull(message = "不能为空", groups = {Add.class})
-        private byte[] passwordHash;
-    
+    @NotNull(message = "不能为空", groups = {Add.class})
+    private byte[] passwordHash;
+
     @TableField("password_salt")
-        @NotNull(message = "不能为空", groups = {Add.class})
-        private byte[] passwordSalt;
-    
+    @NotNull(message = "不能为空", groups = {Add.class})
+    private byte[] passwordSalt;
+
     @ApiModelProperty("创建时间")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-        @NotNull(message = "创建时间不能为空", groups = {Add.class})
-        private LocalDateTime createTime;
-    
+    @NotNull(message = "创建时间不能为空", groups = {Add.class})
+    private LocalDateTime createTime;
+
     @ApiModelProperty("修改时间")
     @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
-    
+
     @ApiModelProperty("所属机构ID")
     @TableField("org_id")
-        private String orgId;
-    
+    private String orgId;
+
     @ApiModelProperty("是否永久用户")
     @TableField("permanent")
     private Boolean permanent;
-    
+
     @ApiModelProperty("生效日期")
     @TableField("effective_date")
     private LocalDate effectiveDate;
-    
+
     @ApiModelProperty("失效日期")
     @TableField("exired_date")
     private LocalDate exiredDate;
-    
+
     @ApiModelProperty(value = "状态", allowableValues = "启用 ENABLE, 禁用DISABLE")
     @TableField("status")
     private String status;
-    
+
     @ApiModelProperty("手机号")
     @TableField("phone")
     private String phone;
-    
+
     @ApiModelProperty("邮箱")
     @TableField("email")
     private String email;
-    
+
     @ApiModelProperty("微信")
     @TableField("we_chat")
     private String weChat;
-    
+
     @ApiModelProperty("固话")
     @TableField("telephone")
     private String telephone;
-    
+
     @ApiModelProperty("0：未删除，1：已删除")
     @TableField("is_deleted")
     private Boolean isDeleted;
-    
+
     @ApiModelProperty("姓名")
     @TableField("real_name")
     private String realName;
@@ -158,17 +156,7 @@ public class TUser implements Serializable {
     @TableField(exist = false)
     private String statusName;
 
-
     @TableField(exist = false)
     private String jwtToken;
 
-    public TUser(String id, String jwtToken) {
-        this.id = id;
-        this.jwtToken = jwtToken;
-    }
-
-    public TUser(String jwtToken) {
-        this.jwtToken = jwtToken;
-    }
-
 }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java

@@ -4,7 +4,7 @@ import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
 import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
 import cn.wisenergy.chnmuseum.party.common.enums.RESULT_INFO_ENUM;
 import cn.wisenergy.chnmuseum.party.model.TUser;
-import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
+import cn.wisenergy.chnmuseum.party.service.TUserService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SimplePropertyPreFilter;
@@ -34,7 +34,7 @@ public class BaseController implements Serializable {
     protected HttpServletRequest request;
 
     @Resource
-    protected TUserServiceImpl userService;
+    protected TUserService userService;
 
     /**
      * <p>