通知调整

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/MyNoticeController.java

@@ -1,10 +1,14 @@
 package com.jeeplus.flowable.controller;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import com.jeeplus.common.TokenProvider;
 import com.jeeplus.flowable.model.MyNoticeList;
 import com.jeeplus.flowable.service.MyNoticeService;
 import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.service.dto.UserDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.ResponseEntity;
@@ -33,7 +37,8 @@ public class MyNoticeController {
     @ApiOperation(value = "新增")
     @GetMapping("/add")
     public String add(String taskId, String title, String defId, String taskName, String createUser, String createTime, String noticeName, String noticeId) throws Exception{
-        return service.add(taskId, title, defId, taskName, createUser, createTime, noticeName, noticeId,"");
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        return service.add(taskId, title, defId, taskName, createUser, createTime, noticeName, noticeId,userDTO.getId());
     }
 
     @ApiOperation(value = "修改已读状态")

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/model/MyNoticeList.java

@@ -41,11 +41,11 @@ public class MyNoticeList extends BaseEntity {
      */
     private String createUser;
 
-    /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
+//    /**
+//     * 创建时间
+//     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private Date createTime;
 
     /**
      * 通知人名称