销假改为可以销假4天以上的事假也可以销假

common/src/main/java/com/jpsoft/shinestar/modules/workflow/service/impl/ProcinstActUserServiceImpl.java

@@ -293,7 +293,11 @@ public class ProcinstActUserServiceImpl implements ProcinstActUserService {
                                         //请假审核
                                         if (requestForLeaveInfo.getStatus() == 0){
                                             requestForLeaveInfo.setStatus(1);
-                                            if ("2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())){
+                                            double days = 0;
+                                            if(StringUtils.isNotEmpty(requestForLeaveInfo.getDays())) {
+                                                days = Double.parseDouble(requestForLeaveInfo.getDays());
+                                            }
+                                            if (("1".equals(requestForLeaveInfo.getLeaveType())&&days>=4) ||"2".equals(requestForLeaveInfo.getLeaveType()) || "5".equals(requestForLeaveInfo.getLeaveType()) || "6".equals(requestForLeaveInfo.getLeaveType())){
                                                 requestForLeaveInfo.setEnableCancel(true);
                                             }