Merge remote-tracking branch 'origin/master'

czt

4 天以前 b1e6bf7d3ed1a1d64182127f83fdc3fad2233a7e

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/PatrolService.java

@@ -38,6 +38,14 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            queryWrapper.eq("dept_id", param.getDeptId());
        }

        if (StringUtils.isNotBlank(param.getUserName())) {
            queryWrapper.like("user_name", param.getUserName());
        }
        if (StringUtils.isNotBlank(param.getConfName())) {
            queryWrapper.like("conf_name", param.getConfName());
        }

        queryWrapper.orderByDesc("create_time");

        return queryWrapper;