From 1577fd7ee29d1b0b7eea979264d5dcdbeab52743 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 15 五月 2026 13:42:48 +0800
Subject: [PATCH] 1首先执行 2次要执行 如果设置了1，只生成1的，2的不生成；如果1的没有生成成功，才会生成2
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index 4bce0af..801edca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -150,10 +150,11 @@
@Log(title = "璇煶浠诲姟", businessType = BusinessType.INSERT)
@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
@PostMapping("/add")
- public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
+ public AjaxResult add(@RequestBody ServiceTask serviceTask) {
SysUser user = getLoginUser().getUser();
- ServiceTask.setOrgid(user.getOrgid());
- return toAjax(serviceTaskService.insertServiceTask(ServiceTask));
+ serviceTask.setOrgid(user.getOrgid());
+ serviceTask.setCampusid(user.getCampusid());
+ return toAjax(serviceTaskService.insertServiceTask(serviceTask));
}
/**
@@ -228,7 +229,7 @@
log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
- return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom()));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(),null));
}
@@ -252,7 +253,7 @@
log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
- return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom()));
+ return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom(),null));
}
--
Gitblit v1.9.3