updateBy

createBy

user-common/src/main/java/com/poyee/utils/ServletUtils.java

@@ -1,5 +1,6 @@
 package com.poyee.utils;
 
+import com.alibaba.fastjson.JSONObject;
 import com.poyee.res.UserInfo;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -42,12 +43,12 @@ public class ServletUtils {
     /**
      * 获取当前登录用户
      */
-    public static UserInfo getCurrentUser() {
+    public static JSONObject getCurrentUser() {
         HttpServletRequest request = getRequest();
         if (request == null) {
             return null;
         }
-        return (UserInfo) request.getAttribute("currentUser");
+        return (JSONObject) request.getAttribute("currentUser");
     }
 
     /**

user-web/src/main/java/com/poyee/facade/impl/SysDictDataFacade.java

@@ -18,6 +18,7 @@ import com.poyee.res.SysDictDataRes;
 import com.poyee.service.SysDictDataService;
 import com.poyee.utils.I18nUtil;
 import com.poyee.utils.LocaleTimeZoneUtil;
+import com.poyee.utils.ServletUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -71,6 +72,7 @@ public class SysDictDataFacade implements ISysDictDataFacade {
         dictData.setDeleteFlag(StatusEnum.FALSE.getCode());
         dictData.setVersion(1);
         dictData.setCreateTime(LocaleTimeZoneUtil.nowUtc());
+        dictData.setCreateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         return sysDictDataService.save(dictData);
     }
 
@@ -88,6 +90,7 @@ public class SysDictDataFacade implements ISysDictDataFacade {
         dictData.setListClass(req.getListClass());
         dictData.setDefaultFlag(req.getDefaultFlag());
         dictData.setStatus(req.getStatus());
+        dictData.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         dictData.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
         return sysDictDataService.updateById(dictData);
     }
@@ -103,6 +106,7 @@ public class SysDictDataFacade implements ISysDictDataFacade {
         list.forEach(item -> {
             item.setDeleteFlag(StatusEnum.TRUE.getCode());
             item.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
+            item.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         });
         return sysDictDataService.updateBatchById(list);
     }

user-web/src/main/java/com/poyee/facade/impl/SysDictTypeFacade.java

@@ -18,6 +18,7 @@ import com.poyee.res.SysDictTypeRes;
 import com.poyee.service.SysDictTypeService;
 import com.poyee.utils.I18nUtil;
 import com.poyee.utils.LocaleTimeZoneUtil;
+import com.poyee.utils.ServletUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +80,7 @@ public class SysDictTypeFacade implements ISysDictTypeFacade {
         dictType.setStatus(Objects.nonNull(req.getStatus()) ? req.getStatus() : StatusEnum.FALSE.getCode());
         dictType.setDeleteFlag(StatusEnum.FALSE.getCode());
         dictType.setVersion(1);
+        dictType.setCreateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         dictType.setCreateTime(LocaleTimeZoneUtil.nowUtc());
         return sysDictTypeService.save(dictType);
     }
@@ -103,6 +105,7 @@ public class SysDictTypeFacade implements ISysDictTypeFacade {
         dictType.setStatus(req.getStatus());
         dictType.setRemark(req.getRemark());
         dictType.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
+        dictType.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
         return sysDictTypeService.updateById(dictType);
     }
 
@@ -116,6 +119,7 @@ public class SysDictTypeFacade implements ISysDictTypeFacade {
         List<SysDictType> list = sysDictTypeService.listByIds(req.getIds());
         list.forEach(item -> {
             item.setDeleteFlag(StatusEnum.TRUE.getCode());
+            item.setUpdateBy(Objects.nonNull(ServletUtils.getCurrentUser()) ? ServletUtils.getCurrentUser().getString("sub") : null);
             item.setUpdateTime(LocaleTimeZoneUtil.nowUtc());
         });
         return sysDictTypeService.updateBatchById(list);