diff options
| author | zhangshuai <[email protected]> | 2024-11-11 10:35:57 +0800 |
|---|---|---|
| committer | zhangshuai <[email protected]> | 2024-11-11 10:35:57 +0800 |
| commit | 09946cb5f9f840624e7dcc58883ca0228d57fc72 (patch) | |
| tree | 7d102912a5726a036b254a1ea5e6a10fe63c96b2 | |
| parent | d357daa29070a28779a4ec39751abd9ecbd02053 (diff) | |
fix: ASW-146 不展示 system 系统用户
| -rw-r--r-- | src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java | 4 | ||||
| -rw-r--r-- | src/main/resources/db/mapper/sys/SysUserMapper.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java index 5b1dff3..77b414a 100644 --- a/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java +++ b/src/main/java/net/geedge/asw/module/runner/job/JobPlaybookExecResultChecker.java @@ -83,7 +83,7 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean { Thread.ofVirtual().start(() -> { String id = job.getId(); EnvironmentEntity environment = environmentService.getById(job.getEnvId()); - log.info("[playbookExecResultChecker] [jobId: {}] [envId]", id, environment.getId()); + log.info("[playbookExecResultChecker] [jobId: {}]", id); JSONObject paramJSONObject = environment.getParamJSONObject(); String url = paramJSONObject.getStr("url"); @@ -226,7 +226,7 @@ public class JobPlaybookExecResultChecker extends QuartzJobBean { Resource fileResource = new FileSystemResource(pcapDestination); // upload pcap file PcapEntity pcapEntity = pcapService.savePcap(fileResource, "", job.getWorkspaceId(), job.getCreateUserId()); - log.info("[playbookExecResultChecker] [startGetJobResultThread] [upload pcap: {}] [job id: {}]: {}] ", T.JSONUtil.toJsonStr(pcapEntity), job.getId()); + log.info("[playbookExecResultChecker] [startGetJobResultThread] [upload pcap: {}] [job id: {}] ", T.JSONUtil.toJsonStr(pcapEntity), job.getId()); job.setPcapId(pcapEntity.getId()); } else { // log diff --git a/src/main/resources/db/mapper/sys/SysUserMapper.xml b/src/main/resources/db/mapper/sys/SysUserMapper.xml index 66f8b9f..531b68b 100644 --- a/src/main/resources/db/mapper/sys/SysUserMapper.xml +++ b/src/main/resources/db/mapper/sys/SysUserMapper.xml @@ -42,8 +42,9 @@ left join sys_user cu on su.create_user_id = cu.id left join sys_user uu on su.update_user_id = uu.id <where> + su.user_name != 'system' <if test="params.ids != null and params.ids != ''"> - su.id in + AND su.id in <foreach item="id" collection="params.ids.split(',')" separator="," open="(" close=")"> #{id} </foreach> |