Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!272

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

@@ -1223,7 +1223,9 @@ public class TimeCardController {
 		Console.log("新增--考勤组id: " + attid);
 		
 		//添加加班规则
-		KqglAssoOvertimeRange.builder().overtimeRulesId(attass.getOvertimeRulesId()).attgroupId(attid).build().insert();
+		if(attass.getOvertimeRulesId() > 0) {
+			KqglAssoOvertimeRange.builder().overtimeRulesId(attass.getOvertimeRulesId()).attgroupId(attid).build().insert();
+		}
 		
 		List<KqglAssoKqzdkfs> kqzdkfslist = new ArrayList<KqglAssoKqzdkfs>();
 		String[] attmac = attass.getAttmachines();//考勤机 
@@ -2569,7 +2571,7 @@ public class TimeCardController {
 		if(yhd != null) {
 			KqglAssoOvertimeRange timeran = KqglAssoOvertimeRange.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRange>().lambda().eq(KqglAssoOvertimeRange::getAttgroupId, yhd.getKqzid()));
 			if(timeran != null) {
-				KqglAssoOvertimeRules rul = KqglAssoOvertimeRules.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRules>().lambda().eq(KqglAssoOvertimeRules::getId, timeran.getOvertimeRulesId()));
+				KqglAssoOvertimeRules rul = KqglAssoOvertimeRules.builder().build().selectOne(new QueryWrapper<KqglAssoOvertimeRules>().lambda().eq(KqglAssoOvertimeRules::getId, timeran.getOvertimeRulesId()).eq(KqglAssoOvertimeRules::getOrgCode, userBean.getOrgCode()));
 				if(rul != null) {
 					if(rul.getIsWorkovertime() == 1) {
 						CompensateDto com = CompensateDto.builder().build();
@@ -3090,12 +3092,12 @@ public class TimeCardController {
 	    	if(bcs != null) {
 //	    		CalendarPunchDetailsDto dets = CalendarPunchDetailsDto.builder().build();
 	    		dets.setClock_num(bcs.getSxbcs()*2);
-	    		dets.setBcsbdk1(("").equals(bcs.getSbdk1()) ? "" : bcs.getSbdk1().replaceAll("\r|\n", ""));
-	    		dets.setBcxbdk1(("").equals(bcs.getXbdk1()) ? "" : bcs.getXbdk1().replaceAll("\r|\n", ""));
-	    		dets.setBcsbdk2(("").equals(bcs.getSbdk2()) ? "" : bcs.getSbdk2().replaceAll("\r|\n", ""));
-	    		dets.setBcxbdk2(("").equals(bcs.getXbdk2()) ? "" : bcs.getXbdk2().replaceAll("\r|\n", ""));
-	    		dets.setBcsbdk3(("").equals(bcs.getSbdk3()) ? "" : bcs.getSbdk3().replaceAll("\r|\n", ""));
-	    		dets.setBcxbdk3(("").equals(bcs.getXbdk3()) ? "" : bcs.getXbdk3().replaceAll("\r|\n", ""));
+	    		dets.setBcsbdk1(bcs.getSbdk1() == null ? "" : bcs.getSbdk1().replaceAll("\r|\n", ""));
+	    		dets.setBcxbdk1(bcs.getXbdk1() == null ? "" : bcs.getXbdk1().replaceAll("\r|\n", ""));
+	    		dets.setBcsbdk2(bcs.getSbdk2() == null ? "" : bcs.getSbdk2().replaceAll("\r|\n", ""));
+	    		dets.setBcxbdk2(bcs.getXbdk2() == null ? "" : bcs.getXbdk2().replaceAll("\r|\n", ""));
+	    		dets.setBcsbdk3(bcs.getSbdk3() == null ? "" : bcs.getSbdk3().replaceAll("\r|\n", ""));
+	    		dets.setBcxbdk3(bcs.getXbdk3() == null ? "" : bcs.getXbdk3().replaceAll("\r|\n", ""));
 //	    		detailed.add(dets);
 	    	}
 	    }
@@ -3157,12 +3159,12 @@ public class TimeCardController {
 		    	KqglAssoBcsz bcs = KqglAssoBcsz.builder().build().selectOne(new QueryWrapper<KqglAssoBcsz>().lambda().eq(KqglAssoBcsz::getId, bcid));
 		    	if(bcs != null) {
 		    		dets.setClock_num(bcs.getSxbcs()*2);
-		    		dets.setBcsbdk1(("").equals(bcs.getSbdk1()) ? "" : bcs.getSbdk1().replaceAll("\r|\n", ""));
-		    		dets.setBcxbdk1(("").equals(bcs.getXbdk1()) ? "" : bcs.getXbdk1().replaceAll("\r|\n", ""));
-		    		dets.setBcsbdk2(("").equals(bcs.getSbdk2()) ? "" : bcs.getSbdk2().replaceAll("\r|\n", ""));
-		    		dets.setBcxbdk2(("").equals(bcs.getXbdk2()) ? "" : bcs.getXbdk2().replaceAll("\r|\n", ""));
-		    		dets.setBcsbdk3(("").equals(bcs.getSbdk3()) ? "" : bcs.getSbdk3().replaceAll("\r|\n", ""));
-		    		dets.setBcxbdk3(("").equals(bcs.getXbdk3()) ? "" : bcs.getXbdk3().replaceAll("\r|\n", ""));
+		    		dets.setBcsbdk1(bcs.getSbdk1() == null ? "" : bcs.getSbdk1().replaceAll("\r|\n", ""));
+		    		dets.setBcxbdk1(bcs.getXbdk1() == null ? "" : bcs.getXbdk1().replaceAll("\r|\n", ""));
+		    		dets.setBcsbdk2(bcs.getSbdk2() == null ? "" : bcs.getSbdk2().replaceAll("\r|\n", ""));
+		    		dets.setBcxbdk2(bcs.getXbdk2() == null ? "" : bcs.getXbdk2().replaceAll("\r|\n", ""));
+		    		dets.setBcsbdk3(bcs.getSbdk3() == null ? "" : bcs.getSbdk3().replaceAll("\r|\n", ""));
+		    		dets.setBcxbdk3(bcs.getXbdk3() == null ? "" : bcs.getXbdk3().replaceAll("\r|\n", ""));
 		    	}
 		    }
 		    detslist.add(dets);