From 6e5df8e12bf4654f81de4e97115fa61fe5305c9f Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Fri, 20 Jun 2025 18:53:47 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=94=A8=E7=8E=AF=E5=A2=83=E5=85=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6runner=E7=BB=84=E8=8C=83=E5=9B=B4=20#[1437065?=
 =?UTF-8?q?558851584]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E7=94=A8=E7=8E=AF=E5=A2=83=E5=85=A5=E5=8F=A3=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?runner=E7=BB=84=E8=8C=83=E5=9B=B4=20http://192.168.0.96:8090/de?=
 =?UTF-8?q?mo/rdm.html#/story-detail/939050947543040/939050947543042/14370?=
 =?UTF-8?q?65558851584?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/tenant/api/role/RoleSearchApi.java         |  2 ++
 .../module/tenant/api/runner/RunnerGroupSaveApi.java  | 11 ++++++-----
 .../tenant/api/runner/RunnerGroupSearchApi.java       |  5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java b/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java
index a901c637..bd7668f2 100644
--- a/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java
@@ -15,6 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.tenant.api.role;
 
+import neatlogic.framework.common.config.Config;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.common.util.PageUtil;
 import neatlogic.framework.dao.mapper.RoleMapper;
@@ -107,6 +108,7 @@ public class RoleSearchApi extends PrivateApiComponentBase {
         List<RoleVo> roleList = roleMapper.searchRole(roleVo);
         roleService.setRoleTeamCountAndRoleUserCount(roleList);
         returnObj.put("tbodyList", roleList);
+        returnObj.put("prefix", Config.HEADER_RULE_PREFIX());
         return returnObj;
     }
 }
diff --git a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java
index b4aba7e7..2b0700ea 100755
--- a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java
@@ -79,11 +79,12 @@ public class RunnerGroupSaveApi extends PrivateApiComponentBase {
 
 
     @Input({
-            @Param(name = "id", type = ApiParamType.LONG, isRequired = false, desc = "id"),
-            @Param(name = "name", type = ApiParamType.STRING, isRequired = true, desc = "runner 分组名"),
-            @Param(name = "description", type = ApiParamType.STRING, isRequired = false, desc = "描述"),
-            @Param(name = "groupNetworkList", type = ApiParamType.JSONARRAY, isRequired = false, desc = "runner组 网段列表"),
-            @Param(name = "runnerList", type = ApiParamType.JSONARRAY, isRequired = false, desc = "关联的runner列表"),
+            @Param(name = "id", type = ApiParamType.LONG, desc = "id"),
+            @Param(name = "name", type = ApiParamType.STRING, isRequired = true, desc = "nmtar.runnergroupsaveapi.input.param.desc.name"),
+            @Param(name = "rule", type = ApiParamType.STRING, desc = "nmtar.runnergroupsaveapi.input.param.desc.rule"),
+            @Param(name = "description", type = ApiParamType.STRING, desc = "common.description"),
+            @Param(name = "groupNetworkList", type = ApiParamType.JSONARRAY, desc = "nmtar.runnergroupsaveapi.input.param.desc.groupnetworklist"),
+            @Param(name = "runnerList", type = ApiParamType.JSONARRAY, desc = "nmtar.runnergroupsaveapi.input.param.desc.runnerlist"),
     })
     @Output({
     })
diff --git a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java
index eeefca30..50c92896 100644
--- a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java
+++ b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java
@@ -17,6 +17,7 @@ package neatlogic.module.tenant.api.runner;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import neatlogic.framework.common.config.Config;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.dao.mapper.runner.RunnerMapper;
 import neatlogic.framework.dto.runner.RunnerGroupVo;
@@ -72,7 +73,9 @@ public class RunnerGroupSearchApi extends PrivateApiComponentBase {
         if (rowNum > 0) {
             runnerGroupVoList = runnerMapper.searchRunnerGroup(groupVo);
         }
-        return TableResultUtil.getResult(runnerGroupVoList, groupVo);
+        JSONObject result = TableResultUtil.getResult(runnerGroupVoList, groupVo);
+        result.put("prefix", Config.HEADER_RULE_PREFIX());
+        return result;
     }
 
 
-- 
Gitee