条件限制

src/main/java/com/ydtech/modules/admin/service/impl/SysGeographyPositionServiceImpl.java

@@ -456,7 +456,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
             }
 
         }
-        Page<SysGeographyPosition> insOrdersPage = null;
+        Page<SysGeographyPosition> insOrdersPage;
         Integer type = addressInfoDto.getType();
         if (type == 1) {
             LambdaQueryWrapper<SysGeographyPosition> wrapper = new LambdaQueryWrapper<>();
@@ -554,7 +554,7 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
             List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                     .eq(SysUser::getLeaderId, BaseController.getUserId()).ne(SysUser::getStatus, 0));
             collectIds = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
-            if (collectIds .size()==0)  return new BasePageResult<>(addressInfoDto.getPageNum(), addressInfoDto.getPageSize(), 0l, 0l, null);
+            if (collectIds .size()==0)  return new BasePageResult<>(addressInfoDto.getPageNum(), addressInfoDto.getPageSize(), 0L, 0L, null);
             List<String> idList = queryList(collectIds, ids);
             collectIds.addAll(idList);
 

src/main/java/com/ydtech/modules/admin/service/impl/SysPcAddressServiceImpl.java

@@ -481,7 +481,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
     @Override
     public BasePageResult<SysPcAddressHistory> queryPcAddressHistoryInfo(PcAddressInfoDto addressInfoDto) {
         Page page = new Page(addressInfoDto.getPageNum(), addressInfoDto.getPageSize());
-        IPage<SysPcAddressHistory> sysPcAddressHistoryIPage = null;
+        IPage<SysPcAddressHistory> sysPcAddressHistoryIPage;
         //登陆人的下属id
         String userId = BaseController.getUserId();
         List<String> collectIds = new ArrayList<>();
@@ -492,7 +492,7 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
                     .eq(SysUser::getLeaderId, BaseController.getUserId()).ne(SysUser::getStatus, 0));
             collectIds = sysUsers.stream().map(SysUser::getId).collect(Collectors.toList());
             if (collectIds.size() == 0)
-                return new BasePageResult<>(addressInfoDto.getPageNum(), addressInfoDto.getPageSize(), 0l, 0l, null);
+                return new BasePageResult<>(addressInfoDto.getPageNum(), addressInfoDto.getPageSize(), 0L, 0L, null);
             List<String> idList = queryList(collectIds, ids);
             collectIds.addAll(idList);
         }