Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!490

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

@@ -3160,7 +3160,7 @@ public class ClockInController {
 							 /****/
 								//事务(请假，加班，调休，出差)
 		 		    			KqglAssoRelationSummary asssum1 = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
-				    						.eq(KqglAssoRelationSummary::getAppTime, str).last("LIMIT 1"));
+				    						.eq(KqglAssoRelationSummary::getAppTime, str).eq(KqglAssoRelationSummary::getOrgCode, userBean.getOrgCode()).last("LIMIT 1"));
 			    				if(asssum1 != null) {
 			    					
 			    					if(asssum1.getApprovalType() != 5) {
@@ -3701,7 +3701,7 @@ public class ClockInController {
 							 
 							 //获取前一天最后下班的时间
 							 yesterdaymx = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userBean.getEmpNum())
-										.ge(KqglAssoDkmx::getDksj, startDateyesterday).le(KqglAssoDkmx::getDksj, endDateyesterday));
+										.ge(KqglAssoDkmx::getDksj, startDateyesterday).le(KqglAssoDkmx::getDksj, endDateyesterday).eq(KqglAssoDkmx::getQyid, userBean.getOrgCode()));
 							 attdateyesterday = MethodCall(userBean.getOrgCode(),userBean.getEmpNum(),yesterday);
 							 
 							 List<AttSchedule> ashyes = attdateyesterday.getAttsch();
@@ -3931,7 +3931,7 @@ public class ClockInController {
 	    		    			
 	    		    			//事务(请假，加班，调休，出差)
 	    		    			KqglAssoRelationSummary asssum = KqglAssoRelationSummary.builder().build().selectOne(new QueryWrapper<KqglAssoRelationSummary>().lambda().eq(KqglAssoRelationSummary::getUserId, userBean.getEmpNum())
-    		    						.eq(KqglAssoRelationSummary::getAppTime, num).last("LIMIT 1"));
+    		    						.eq(KqglAssoRelationSummary::getAppTime, num).eq(KqglAssoRelationSummary::getOrgCode, userBean.getOrgCode()).last("LIMIT 1"));
     		    				if(asssum != null) {
     		    					if(asssum.getApprovalType() == 5) {//补卡
     		    						wocal.setCalendar_status(1);//打卡正常