Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/system/SysDeptMapper.xml

@@ -88,7 +88,7 @@
 	<select id="selectDeptByCode" resultMap="SysDeptResult">
 		select *
 		from sys_dept d
-		where d.dept_code= #{deptCode}
+		where d.dept_code= #{deptCode} and d.del_flag = 0
 	</select>