Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!296

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

@@ -1729,6 +1729,7 @@ public class ClockInController {
 		 
 		 KqglMainKqz attgro = kqglmainkqzmapper.getAttendanceGroupInformationByUserid(userBean.getEmpNum(),userBean.getOrgCode()); //考勤组信息
 		 
+		 if(attgro != null) {
 			//APP获取当前天的考勤信息
 			 AttendanceCardListDto attdate = MethodCall(userBean.getOrgCode(),userBean.getEmpNum(),attconditions.getDate());
 				 
@@ -1873,7 +1874,12 @@ public class ClockInController {
 			 attdate.setChanged_time(changed_time);
 		     
 			return ResultUtil.data(attdate);
+		 }else {
+			 
+			 AttendanceCardListDto attdate_ = AttendanceCardListDto.builder().build();
 			 
+			 return ResultUtil.data(attdate_,"未加入考勤组");
+		 }
 	 }
 	
 }