Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java

@@ -140,12 +140,10 @@ public class SysTaskPlanService implements ISysTaskPlanService {
     @Override
     @ApiOperation(value = "查询任务计划", notes = "根据任务计划名称与组名称查询")
     public SysTaskPlan getSysTaskPlanByNameAndGroup(String name, String groupName) {
-        List<SysTaskPlan> sysTaskPlanList = sysTaskPlanRDao.findByProperty(new String[]{"name", "groupName"},
+        return sysTaskPlanRDao.getByProperty(
-                new Object[]{name, groupName});
+                new String[]{"name", "groupName"},
-        if (sysTaskPlanList != null && sysTaskPlanList.isEmpty()) {
+                new Object[]{name, groupName}
-            return sysTaskPlanList.get(0);
+        );
-        }
-        return null;
     }
 
     @Override