Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!201

src/main/java/cn/timer/api/dto/kqmk/AttqueryCriteriaDto.java

@@ -18,4 +18,7 @@ public class AttqueryCriteriaDto extends Page {
 	
 	
 	@ApiModelProperty(value = "关键字", example = "")
 	@ApiModelProperty(value = "关键字", example = "")
 	private String query;
 	private String query;
+	
+	@ApiModelProperty(value = "部门ID", example = "")
+	private Integer deptid;
 }
 }

src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml

@@ -83,6 +83,9 @@
 						emp.emp_num like CONCAT('%',#{param.query},'%') or
 						emp.emp_num like CONCAT('%',#{param.query},'%') or
 						c.name like CONCAT('%',#{param.query},'%'))
 						c.name like CONCAT('%',#{param.query},'%'))
 			</if>
 			</if>
+			<if test="param.deptid != null and param.deptid != ''">
+				and c.id = #{param.deptid}
+			</if>
 			ORDER BY emp.emp_num DESC
 			ORDER BY emp.emp_num DESC
     </select>
     </select>