Merge remote-tracking branch 'origin/yellow' into yellow

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/PostNoticeController.java

@@ -1,12 +1,16 @@
 package com.ruoyi.web.controller.system;
 
 
+import java.util.Date;
 import java.util.List;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +38,9 @@ public class PostNoticeController extends BaseController
     @Autowired
     private IPostNoticeService postNoticeService;
 
+    @Autowired
+    private HttpServletRequest request;
+
     /**
      * 查询公告列表
      */
@@ -111,6 +118,10 @@ public class PostNoticeController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody PostNotice postNotice)
     {
+        postNotice.setCreateBy(getUsername());
+        postNotice.setCreateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
+        postNotice.setUpdateBy(getUsername());
+        postNotice.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
         return toAjax(postNoticeService.insertPostNotice(postNotice));
     }
 
@@ -123,6 +134,8 @@ public class PostNoticeController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody PostNotice postNotice)
     {
+        postNotice.setUpdateBy(getUsername());
+        postNotice.setUpdateTime(DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,DateUtils.getTime()));
         return toAjax(postNoticeService.updatePostNotice(postNotice));
     }