南昌市物联网技防平台-后台
zengh
2021-07-27 b1d5e0d7aadc91ce1415290915868694bd766dfd
添加时间筛选
2 files modified
5 ■■■■■ changed files
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml 3 ●●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java 2 ●●● patch | view | raw | blame | history
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -809,7 +809,8 @@
        WHERE
        <if test="alarm.securityArr!=null and alarm.securityArr!=''">
            securityId = "" or securityId IS NULL
            (securityId = "" or securityId IS NULL)
            AND jtype != 2
            AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
        </if>
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/feedback/controller/FeedbackController.java
@@ -310,7 +310,7 @@
                iWjService.insertfeed(wj);
            }
        }
        alarmService.updateJtype(operation.getJid(), "2", null, null,null);
//        alarmService.updateJtype(operation.getJid(), "2", null, null,null);
        return R.success("新增成功");
    }