2.0

xm-core/src/main/java/com/xm/core/ctrl/XmBudgetLaborController.java

@@ -203,8 +203,6 @@ public class XmBudgetLaborController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -285,7 +283,6 @@ public class XmBudgetLaborController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 

xm-core/src/main/java/com/xm/core/ctrl/XmBudgetNlaborController.java

@@ -202,8 +202,6 @@ public class XmBudgetNlaborController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -283,7 +281,6 @@ public class XmBudgetNlaborController {
             }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);
@@ -228,8 +226,6 @@ public class XmFuncController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -270,7 +266,6 @@ public class XmFuncController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 

xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java

@@ -395,8 +395,6 @@ public class XmIterationController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 

xm-core/src/main/java/com/xm/core/ctrl/XmMenuCommentController.java

@@ -378,8 +378,6 @@ public class XmMenuCommentController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 	*/
@@ -422,7 +420,6 @@ public class XmMenuCommentController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmMyFocusController.java

@@ -235,8 +235,6 @@ public class XmMyFocusController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 	*/
@@ -278,7 +276,6 @@ public class XmMyFocusController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	}
 }

xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java

@@ -225,8 +225,6 @@ public class XmRecordVisitController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 	*/
@@ -269,7 +267,6 @@ public class XmRecordVisitController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmRptConfigController.java

@@ -185,8 +185,6 @@ public class XmRptConfigController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -227,7 +225,6 @@ public class XmRptConfigController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 

xm-core/src/main/java/com/xm/core/ctrl/XmRptDataController.java

@@ -198,8 +198,6 @@ public class XmRptDataController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 	*/
@@ -245,7 +243,6 @@ public class XmRptDataController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	}
 }

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -451,8 +451,6 @@ public class XmTaskController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 

xm-core/src/main/java/com/xm/core/ctrl/XmTaskEvalController.java

@@ -245,8 +245,6 @@ public class XmTaskEvalController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -287,7 +285,6 @@ public class XmTaskEvalController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 

xm-core/src/main/java/com/xm/core/ctrl/XmTaskOrderController.java

@@ -358,8 +358,6 @@ public class XmTaskOrderController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 	*/
@@ -402,7 +400,6 @@ public class XmTaskOrderController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 	*/

xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java

@@ -267,8 +267,6 @@ public class XmTaskSbillDetailController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -320,7 +318,6 @@ public class XmTaskSbillDetailController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	}
 }

xm-core/src/main/java/com/xm/core/ctrl/XmTestCaseController.java

@@ -301,8 +301,6 @@ public class XmTestCaseController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -358,7 +356,6 @@ public class XmTestCaseController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	}
 }

xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java

@@ -265,8 +265,6 @@ public class XmTestCasedbController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 

xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java

@@ -380,8 +380,6 @@ public class XmTestPlanCaseController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -441,7 +439,6 @@ public class XmTestPlanCaseController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	} 
 

xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java

@@ -281,8 +281,6 @@ public class XmTestPlanController {
 			}else {
 				return Result.error(msgs.stream().collect(Collectors.joining()));
 			} 
-			//
-		return Result.ok();
 		
 	}
 
@@ -338,7 +336,6 @@ public class XmTestPlanController {
             }else {
                 return Result.error(msgs.stream().collect(Collectors.joining()));
             } 
-        return Result.ok();
         
 	}