1

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

@@ -198,6 +198,9 @@ public class TmProject implements Serializable {
     @TableField("latlng")
     private String latlng ;
 
+    @TableField("map_show")
+    private Boolean mapShow ;
+
     @TableField(exist = false)
     private Integer caseId;
 

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

@@ -8,6 +8,7 @@ import com.fdkankan.fusion.mapper.ICaseImgMapper;
 import com.fdkankan.fusion.request.CaseImgParam;
 import com.fdkankan.fusion.service.ICaseImgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -30,6 +31,14 @@ public class CaseImgServiceImpl extends ServiceImpl<ICaseImgMapper, CaseImg> imp
         }
         LambdaQueryWrapper<CaseImg> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseImg::getCaseId,param.getCaseId());
+        if(param.getStatus() != null){
+            wrapper.eq(CaseImg::getStatus,param.getStatus());
+        }
+        if(StringUtils.isNotBlank(param.getOrderBy()) && param.getOrderBy().contains("sort")){
+            wrapper.apply(" order by " + param.getOrderBy());
+        }else {
+           wrapper.orderByDesc(CaseImg::getId);
+        }
         return this.list(wrapper);
     }
 }

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

@@ -75,6 +75,7 @@ public class TmProjectServiceImpl extends ServiceImpl<ITmProjectMapper, TmProjec
             String share = SaHolder.getRequest().getHeader("share");
             if(StringUtils.isNotBlank(share) && "1".equals(share)){ //分享请求头
                 deptIds = tmDepartmentService.list().stream().map(TmDepartment::getId).collect(Collectors.toList());
+                wrapper.eq(TmProject::getMapShow,false);
             }else {
                 deptIds = tmDepartmentService.getDeptIds();
             }