修复BUG

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

@@ -496,11 +496,16 @@ public class ClockInController {
 											 if(iswzwd > 0) {
 												//统一分钟数
 											    xbwz1 = Double.valueOf(shif.getXbwz1()) * 60;//下班晚走1
-												sbwd1 = Integer.valueOf(String.valueOf(Double.valueOf(shif.getSbwd1()) * 60));//上班晚到1
+											    String sbwd1_ = String.valueOf(Double.valueOf(shif.getSbwd1()) * 60);
+												sbwd1 = Integer.valueOf(sbwd1_.substring(0, sbwd1_.lastIndexOf(".")));//上班晚到1
+												
 												xbwz2 = Double.valueOf(shif.getXbwz2()) * 60;//下班晚走2
-												sbwd2 = Integer.valueOf(String.valueOf(Double.valueOf(shif.getSbwd2()) * 60));//上班晚到2
+												String sbwd2_ = String.valueOf(Double.valueOf(shif.getSbwd2()) * 60);
+												sbwd2 = Integer.valueOf(sbwd2_.substring(0, sbwd2_.lastIndexOf(".")));//上班晚到2
+												
 												xbwz3 = Double.valueOf(shif.getXbwz3()) * 60;//下班晚走3
-												sbwd3 = Integer.valueOf(String.valueOf(Double.valueOf(shif.getSbwd3()) * 60));//上班晚到3
+												String sbwd3_ = String.valueOf(Double.valueOf(shif.getSbwd3()) * 60);
+												sbwd3 = Integer.valueOf(sbwd3_.substring(0, sbwd3_.lastIndexOf(".")));//上班晚到3
 													
 												 //获取前一天最后下班的时间
 												 yesterdaymx = KqglAssoDkmx.builder().build().selectOne(new QueryWrapper<KqglAssoDkmx>().lambda().eq(KqglAssoDkmx::getUserid, userid)
@@ -535,7 +540,7 @@ public class ClockInController {
 													 }
 													 
 													 //存在晚走玩到
-													 if(iswzwd > 0) {
+													 if(iswzwd > 0 && yesterdaymx != null) {
 														 if(dkcs_ == 1) {
 															 if(yesterdaymx.getXbdk1() != null && yesterdaymx.getXbdk1jg() == 0) {
 																 latetime = (yesterdaymx.getXbdk1() - yesendtime1)/1000/60;

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -307,6 +307,7 @@ public class SpmkController {
 //		if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) 
 //			return ResultUtil.error("审批组存在 自定义审批,不可直接删除!");
 		
+		SpmkCustomApproval.builder().build().delete(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id));
         return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象");
 		
 	}