Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
This commit is contained in:
commit
935e4353cb
@ -220,7 +220,7 @@ public class CarInfoController {
|
|||||||
queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
|
queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
|
||||||
.eq(CarInfo::getCarNumber, carInfo.getCarNumber());
|
.eq(CarInfo::getCarNumber, carInfo.getCarNumber());
|
||||||
CarInfo old = carInfoService.getOne(queryWrapper);
|
CarInfo old = carInfoService.getOne(queryWrapper);
|
||||||
if (Objects.equals(old.getIsBlack(), 1)) {
|
if (old != null && Objects.equals(old.getIsBlack(), 1)) {
|
||||||
List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
|
List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
|
||||||
for (String s : collect) {
|
for (String s : collect) {
|
||||||
noticeService.addUserNotice(Long.valueOf(s), StrUtil.format("【({})车辆已被拉黑,无法再进行新增】", carInfo.getCarNumber()),
|
noticeService.addUserNotice(Long.valueOf(s), StrUtil.format("【({})车辆已被拉黑,无法再进行新增】", carInfo.getCarNumber()),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user