xiewj 1 year ago
parent
commit
41e76be9ca

+ 3 - 2
720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/provider/WorkProvider.java

@@ -18,8 +18,7 @@ import java.util.List;
 public class WorkProvider {
 
     public String search(AgePageDto param, String userId){
-        StringBuffer sql = new StringBuffer("select * from tb_work where is_delete = 0 and status > 0");
-
+        StringBuffer sql = new StringBuffer("select * from tb_work where is_delete = 0");
         if(StrUtil.isNotBlank(userId)){
             sql.append(" and ( user_id = '").append(RegexUtil.escapeChar(userId)).append("' )");
         }
@@ -49,6 +48,8 @@ public class WorkProvider {
         List<String> snCodes = param.getSnCodes();
         if (ArrayUtil.isNotEmpty(snCodes)){
             sql.append(" and (  sn_code in (").append(StringUtils.join(snCodes, ",")).append(") )");
+        }else {
+            sql.append(" and status > 0");
         }
 
 

+ 1 - 0
720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -1157,6 +1157,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
             return Result.failure("获取四维用户激光数据失败");
         }
         startPage(param);
+        param.setSnCodes(snCodes);
         List<WorkEntity> search = entityMapper.search(param, "");
 
         return Result.success(new PageInfo<>(search));