@@ -51,7 +51,7 @@ public class WarningController { | |||
* 预警确认 | |||
*/ | |||
@PostMapping("/confirm") | |||
public JsonResult confirm(@RequestBody WarningConfirmRequest request){ | |||
public JsonResult confirm(WarningConfirmRequest request){ | |||
return warningService.confirm(request); | |||
} | |||
@@ -57,7 +57,7 @@ public class WarningConfirmService { | |||
*/ | |||
private JsonResult check(Integer tenantId, WarningConfirmRequest request) { | |||
// 判断预警id是否为空 | |||
if (ObjectUtil.isNotNull(request.getId())) { | |||
if (ObjectUtil.isNull(request.getId())) { | |||
throw new ServiceException("预警ID为空"); | |||
} | |||
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() |
@@ -57,7 +57,7 @@ public class WarningIgnoreService { | |||
*/ | |||
private JsonResult check(Integer tenantId, Integer id) { | |||
// 判断预警id是否为空 | |||
if (ObjectUtil.isNotNull(id)) { | |||
if (ObjectUtil.isNull(id)) { | |||
throw new ServiceException("预警ID为空"); | |||
} | |||
Warning warning = warningMapper.selectOne(new LambdaQueryWrapper<Warning>() |
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||
</select> | |||
<update id="confirm" parameterType="hashmap"> | |||
update th_inspection_file | |||
update th_warning | |||
<trim prefix="SET" suffixOverrides=","> | |||
<if test="status != null"> status = #{status}, </if> | |||
<if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if> | |||
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||
</update> | |||
<update id="ignore" parameterType="hashmap"> | |||
update th_inspection_file | |||
update th_warning | |||
<trim prefix="SET" suffixOverrides=","> | |||
<if test="status != null"> status = #{status}, </if> | |||
<if test="updateUser != null and updateUser != ''"> update_user = #{updateUser}, </if> |