2.0

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();
+            } 
         
 	} 
 

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();
+            } 
         
 	} 
 

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();
+            } 
         
 	} 
 

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();
+			} 
 		
 	}
 

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();
+            } 
         
 	} 
 	*/

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();
+            } 
         
 	}
 }

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();
+            } 
         
 	} 
 	*/

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();
+            } 
         
 	} 
 

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();
+            } 
         
 	}
 }

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();
+			} 
 		
 	}
 

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();
+            } 
         
 	} 
 

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();
+            } 
         
 	} 
 	*/

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();
+            } 
         
 	}
 }

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();
+            } 
         
 	}
 }

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();
+			} 
 		
 	}
 

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();
+            } 
         
 	} 
 

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();
+            } 
         
 	}