Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!113

src/main/java/cn/timer/api/controller/kqgl/ClockInTool.java

@@ -33,7 +33,7 @@ public class ClockInTool {
 		// 用StringBuffer来存放数组中的非空元素，用“;”分隔
 		// 用StringBuffer来存放数组中的非空元素，用“;”分隔
 		StringBuffer sb = new StringBuffer();
 		StringBuffer sb = new StringBuffer();
 		for (int i = 0; i < str.length; i++) {
 		for (int i = 0; i < str.length; i++) {
-			if ("".equals(str[i])) {
+			if ("null".equals(str[i])) {
 				continue;
 				continue;
 			}
 			}
 			sb.append(str[i]);
 			sb.append(str[i]);

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

@@ -108,6 +108,7 @@
 			LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
 			LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
 			LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
 			LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
 			where emp.org_code = #{orgcode} 
 			where emp.org_code = #{orgcode} 
+			and emp.job_status in (0,1)
     </select>
     </select>
 
 
 	<!-- 
 	<!--