1

src/main/java/com/fdkankan/fusion/entity/TmProject.java

@@ -162,7 +162,6 @@ public class TmProject implements Serializable {
      * 是否删除: 0->未删除;1->已删除
      */
     @TableField("is_delete")
-    @TableLogic
     private Integer isDelete;
 
     /**

src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -140,6 +140,11 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
         if(StringUtils.isNotBlank(tmProject.getStatus())){
             wrapper.eq(TmProject::getStatus , tmProject.getStatus());
         }
+        if(tmProject.getIsDelete() != null){
+            wrapper.eq(TmProject::getIsDelete,tmProject.getIsDelete());
+        }else {
+            wrapper.eq(TmProject::getIsDelete,0);
+        }
         wrapper.orderByDesc(TmProject::getCreateTime);
         Page<TmProject> page = this.page(new Page<>(tmProject.getPageNum(), tmProject.getPageSize()), wrapper);
         List<String> ids = page.getRecords().stream().map(TmProject::getId).collect(Collectors.toList());