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