crmeb-service/src/main/java/com/zbkj/service/service/impl/OrganizationDepartmentServiceImpl.java

@@ -90,7 +90,9 @@ public class OrganizationDepartmentServiceImpl extends ServiceImpl<OrganizationD
 
         LambdaQueryWrapper<OrganizationDepartmentUser> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(OrganizationDepartmentUser::getOrganizationId, organizationId);
-        queryWrapper1.in(OrganizationDepartmentUser::getDepartmentId, split);
+        if (StringUtils.isNotBlank(departmentId)){
+            queryWrapper1.in(OrganizationDepartmentUser::getDepartmentId, split);
+        }
         List<OrganizationDepartmentUser> list = organizationDepartmentUserService.list(queryWrapper1);
         List<String> ids = list.stream().map(OrganizationDepartmentUser::getDepartmentId).collect(Collectors.toList());
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/SeckillActivityTimeServiceImpl.java

@@ -109,8 +109,8 @@ public class SeckillActivityTimeServiceImpl extends ServiceImpl<SeckillActivityT
         lqw.select(SeckillActivityTime::getId, SeckillActivityTime::getSeckillId);
         lqw.le(SeckillActivityTime::getStartDate, dateInt);
         lqw.ge(SeckillActivityTime::getEndDate, dateInt);
-        lqw.le(SeckillActivityTime::getStartTime, timeInt);
-        lqw.ge(SeckillActivityTime::getEndTime, timeInt);
+//        lqw.le(SeckillActivityTime::getStartTime, timeInt);
+//        lqw.ge(SeckillActivityTime::getEndTime, timeInt);
         lqw.groupBy(SeckillActivityTime::getSeckillId);
         List<SeckillActivityTime> timeList = dao.selectList(lqw);
         return timeList.stream().map(SeckillActivityTime::getSeckillId).collect(Collectors.toList());