大屏今日应急bug修复
This commit is contained in:
+1
-1
@@ -116,7 +116,7 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
|
|||||||
queryWrapper.apply("DATE_FORMAT(help_time,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
|
queryWrapper.apply("DATE_FORMAT(help_time,'%Y-%m') = DATE_FORMAT(NOW(),'%Y-%m')");
|
||||||
break;
|
break;
|
||||||
case "4":
|
case "4":
|
||||||
queryWrapper.apply("YEARWEEK(date_format(help_time,'%Y-%m-%d')) = YEARWEEK(now())");
|
queryWrapper.apply("YEARWEEK(date_format(help_time,'%Y-%m-%d'), 1) = YEARWEEK(now(), 1)");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
@@ -2857,6 +2857,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||||||
@Override
|
@Override
|
||||||
public List<SysUser> getUserByPhoneList(List<String> phoneList) {
|
public List<SysUser> getUserByPhoneList(List<String> phoneList) {
|
||||||
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
queryWrapper.eq(SysUser::getDelFlag, 0);
|
||||||
|
queryWrapper.eq(SysUser::getStatus, 1);
|
||||||
|
queryWrapper.eq(SysUser::getPersonType, 1);
|
||||||
queryWrapper.in(SysUser::getPhone, phoneList);
|
queryWrapper.in(SysUser::getPhone, phoneList);
|
||||||
return list(queryWrapper);
|
return list(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user