Browse Source

审核记录时间显示修复。
严重:待办任务可以看到其他公司的任务bug修复

seyason 2 years ago
parent
commit
d29a05862e

+ 3 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -698,10 +698,12 @@ public class TaskController {
     public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize,Integer type) {
     public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize,Integer type) {
         HttpRespMsg msg = new HttpRespMsg();
         HttpRespMsg msg = new HttpRespMsg();
         String userId = request.getHeader("Token");
         String userId = request.getHeader("Token");
+        User user = userMapper.selectById(userId);
+        Integer companyId = user.getCompanyId();
         QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
         QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
 
 
         //任务状态
         //任务状态
-        queryWrapper.eq("task_status", status);
+        queryWrapper.eq("task_status", status).eq("task.company_id", companyId);
         if (viewId == 1) {
         if (viewId == 1) {
             //我执行的任务
             //我执行的任务
             queryWrapper.like("executor_id", userId);
             queryWrapper.like("executor_id", userId);

+ 4 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ReportAuditLog.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
@@ -37,6 +39,8 @@ public class ReportAuditLog extends Model<ReportAuditLog> {
     private String userName;
     private String userName;
 
 
     @TableField("indate")
     @TableField("indate")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime indate;
     private LocalDateTime indate;
 
 
     @TableField("company_id")
     @TableField("company_id")