lyhzzz 1 year ago
parent
commit
e080399ce5

+ 1 - 1
src/main/java/com/fdkankan/fusion/config/SaTokenConfigure.java

@@ -44,7 +44,7 @@ public class SaTokenConfigure {
     public SaServletFilter getSaServletFilter() {
         return new SaServletFilter()
                 // 指定 拦截路由 与 放行路由
-                .addInclude("/**").addExclude("/**/test/**","/**/inner/**","/**/notAuth/**","/**/systemSetting/**","/**/downMD5/**")
+                .addInclude("/**").addExclude("/**/test/**","/**/inner/**","/**/notAuth/**","/**/systemSetting/**","/**/downMD5/**","/**/downDocx/**")
                 // 认证函数: 每次请求执行
                 .setAuth(obj -> {
                     String share = SaHolder.getRequest().getHeader("share");

+ 0 - 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;
 
     /**

+ 2 - 0
src/main/java/com/fdkankan/fusion/request/ProjectRequestDto.java

@@ -51,6 +51,8 @@ public class ProjectRequestDto extends RequestBase {
     private String accidentDateStart;
     private String accidentDateEnd;
 
+    private Integer isDelete = 0;
+
     public String getAccidentDateStart() {
         if(StringUtils.isNotBlank(accidentDate)){
            return accidentDate +" 00:00:00";

+ 1 - 0
src/main/java/com/fdkankan/fusion/service/impl/TmProjectServiceImpl.java

@@ -67,6 +67,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
     @Override
     public Object pageList(ProjectRequestDto tmProject) {
         LambdaQueryWrapper<TmProject> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(TmProject::getIsDelete,tmProject.getIsDelete());
         //教学场景
         List<String> deptIds;
         if(tmProject.getQueryType() != null && tmProject.getQueryType() == 2){