diff --git a/src/main/java/cn/timer/api/dto/kqmk/AttqueryCriteriaDto.java b/src/main/java/cn/timer/api/dto/kqmk/AttqueryCriteriaDto.java index cafce49..7ddf6bf 100644 --- a/src/main/java/cn/timer/api/dto/kqmk/AttqueryCriteriaDto.java +++ b/src/main/java/cn/timer/api/dto/kqmk/AttqueryCriteriaDto.java @@ -18,4 +18,7 @@ public class AttqueryCriteriaDto extends Page { @ApiModelProperty(value = "关键字", example = "") private String query; + + @ApiModelProperty(value = "部门ID", example = "") + private Integer deptid; } diff --git a/src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml b/src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml index 00ea379..e5f2e81 100644 --- a/src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml +++ b/src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml @@ -83,6 +83,9 @@ emp.emp_num like CONCAT('%',#{param.query},'%') or c.name like CONCAT('%',#{param.query},'%')) </if> + <if test="param.deptid != null and param.deptid != ''"> + and c.id = #{param.deptid} + </if> ORDER BY emp.emp_num DESC </select>