From 14439a203b7475e6163c7f3883818a9a74fce3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B9=85=E5=93=A5?= <787952492@qq.com>
Date: Mon, 13 Jun 2022 16:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E6=88=91=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/farm/dal/dataobject/project/ProjectDO.java    | 3 +++
 .../yudao/module/farm/service/project/ProjectServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java
index daead16e..0a28b840 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/dal/dataobject/project/ProjectDO.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.farm.dal.dataobject.project;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import java.util.*;
@@ -54,10 +55,12 @@ public class ProjectDO extends BaseDO {
     /**
      * 
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date planStartTime;
     /**
      * 
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date planEndTime;
     /**
      * 
diff --git a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java
index a67c65d1..d228fb5a 100644
--- a/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java
+++ b/zsw-farm/zsw-farm-impl/src/main/java/cn/iocoder/yudao/module/farm/service/project/ProjectServiceImpl.java
@@ -155,7 +155,7 @@ public class ProjectServiceImpl implements ProjectService {
 
         if (ObjectUtil.isNotEmpty(pageDTO.getMyProject()) && pageDTO.getMyProject()){
             //查看我参与的项目
-            queryWrapperX.last(" and JSON_CONTAINS(members, '"+ getLoginUserId()+"')");
+            queryWrapperX.last(" and JSON_CONTAINS(members, '"+ getLoginUserId()+"') OR creator = "+ getLoginUserId());
         }
 
         List<ProjectDO> list = projectMapper.selectList(queryWrapperX);