|
|
@@ -198,7 +198,8 @@ public class MealApplicationsServiceImpl extends ServiceImpl<MealApplicationsMap
|
|
|
User user = userMapper.selectById(request.getHeader("token"));
|
|
|
List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
|
|
|
List<MealApplications> mealApplicationsList = mealApplicationsMapper.selectList(
|
|
|
- new QueryWrapper<MealApplications>().select("distinct user_id").between("application_date", startDate, endDate).ne("status", 2));
|
|
|
+ new QueryWrapper<MealApplications>().select("distinct user_id")
|
|
|
+ .between("application_date", startDate, endDate).ne("status", 2).eq("meal_type_id", mealTypeId));
|
|
|
Integer companyId = user.getCompanyId();
|
|
|
QueryWrapper<User> queryWrapper=new QueryWrapper<>();
|
|
|
queryWrapper.eq("company_id",companyId);
|