20220324

xiaoyong931011

2022-03-28 3818d03e7e911a02531806241b34b0c51b277944

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -550,7 +550,7 @@
//        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
//                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
                    && BooleanEnum.TRUE.getValue().equals(shopManageAbleCancelDfkOrder.getParamValue())) {
                    && BooleanEnum.TRUE.getValue() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) {

            if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY)
                    && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {