diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java index e563abb1..25b452ca 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java @@ -202,9 +202,7 @@ public class XmBudgetLaborController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -284,8 +282,7 @@ public class XmBudgetLaborController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java index 0fb4becb..4ba19d73 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java @@ -201,9 +201,7 @@ public class XmBudgetNlaborController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -282,8 +280,7 @@ public class XmBudgetNlaborController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java index e4b1afc8..482ea564 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java @@ -111,10 +111,8 @@ public class XmFuncController { } User user=LoginUtils.getCurrentUserInfo(); XmProduct xmProduct=xmProductService.getProductFromCache(xmFunc.getProductId()); - tips=productQxService.checkProductQx(xmProduct,2,user); - if(!tips.isOk()){ - return Result.error(tips); - } + Tips tips=productQxService.checkProductQx(xmProduct,2,user); + Result.assertIsFalse(tips); xmFunc.setPbranchId(xmProduct.getBranchId()); xmFuncService.parentIdPathsCalcBeforeSave(xmFunc); xmFuncService.insert(xmFunc); @@ -227,9 +225,7 @@ public class XmFuncController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -269,8 +265,7 @@ public class XmFuncController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index 8bbf3c14..a9457b52 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -394,9 +394,7 @@ public class XmIterationController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java index d044aa5c..cdfdb719 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java @@ -377,9 +377,7 @@ public class XmMenuCommentController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } */ @@ -421,8 +419,7 @@ public class XmMenuCommentController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } */ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java index 43f9f719..cc012a6c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java @@ -234,9 +234,7 @@ public class XmMyFocusController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } */ @@ -277,8 +275,7 @@ public class XmMyFocusController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java index 7fdafa68..fa41a301 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java @@ -224,9 +224,7 @@ public class XmRecordVisitController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } */ @@ -268,8 +266,7 @@ public class XmRecordVisitController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } */ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java index 69128a08..7a5824e2 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java @@ -184,9 +184,7 @@ public class XmRptConfigController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -226,8 +224,7 @@ public class XmRptConfigController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java index 1801fcdb..1ef4c12d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java @@ -197,9 +197,7 @@ public class XmRptDataController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } */ @@ -244,8 +242,7 @@ public class XmRptDataController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 7941f247..181e372d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -450,9 +450,7 @@ public class XmTaskController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java index cfe05ef8..2a94a083 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java @@ -244,9 +244,7 @@ public class XmTaskEvalController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -286,8 +284,7 @@ public class XmTaskEvalController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java index cb67dd43..d6d298cc 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java @@ -357,9 +357,7 @@ public class XmTaskOrderController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } */ @@ -401,8 +399,7 @@ public class XmTaskOrderController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } */ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java index 8d6886fd..489ca490 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java @@ -266,9 +266,7 @@ public class XmTaskSbillDetailController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -319,8 +317,7 @@ public class XmTaskSbillDetailController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java index 08fe9f78..40642010 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java @@ -300,9 +300,7 @@ public class XmTestCaseController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -357,8 +355,7 @@ public class XmTestCaseController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java index f4462fbf..7b0df6e7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java @@ -264,9 +264,7 @@ public class XmTestCasedbController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java index 26deb2b9..50296fd0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java @@ -379,9 +379,7 @@ public class XmTestPlanCaseController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -440,8 +438,7 @@ public class XmTestPlanCaseController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java index fb71cc02..fd0aa7cf 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java @@ -280,9 +280,7 @@ public class XmTestPlanController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - // - return Result.ok(); + } } @@ -337,8 +335,7 @@ public class XmTestPlanController { return Result.ok(msgs.stream().collect(Collectors.joining())); }else { return Result.error(msgs.stream().collect(Collectors.joining())); - } - return Result.ok(); + } }