From ac6fb877065f1003467480e1734dbd57ae2d7d7d Mon Sep 17 00:00:00 2001 From: zhanghongbo Date: Tue, 17 Dec 2024 09:47:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=B8=AD=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/resources/http/orgjob/org-job.http | 23 +++++++++++++++++++ .../test/resources/http/orguser/org-user.http | 16 +++++-------- .../infra/dao/orgjob/entity/OrgJob.java | 8 +++++++ 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/orgmanax-api/src/test/resources/http/orgjob/org-job.http b/orgmanax-api/src/test/resources/http/orgjob/org-job.http index 3983f2c..b5aba2c 100644 --- a/orgmanax-api/src/test/resources/http/orgjob/org-job.http +++ b/orgmanax-api/src/test/resources/http/orgjob/org-job.http @@ -11,6 +11,29 @@ Accept: application/json ### +#修改 +POST {{host}}/api/org/job/update +Content-Type: application/json +Accept: application/json + +{ + "id": 3588, + "name": "cold_blade2" +} + +### + +#删除 +POST {{host}}/api/org/job/delete +Content-Type: application/json +Accept: application/json + +{ + "id": 1868594127823040515 +} + +### + # 查询 POST {{host}}/api/org/job/list Content-Type: application/json diff --git a/orgmanax-api/src/test/resources/http/orguser/org-user.http b/orgmanax-api/src/test/resources/http/orguser/org-user.http index b372604..5744dbd 100644 --- a/orgmanax-api/src/test/resources/http/orguser/org-user.http +++ b/orgmanax-api/src/test/resources/http/orguser/org-user.http @@ -1,14 +1,10 @@ -# 查询协同关系 -POST {{host}}/api/org/cooperate-ship/list +# 查询 +POST {{host}}/api/org/org-user/list Content-Type: application/json Accept: application/json { - "workspaceId": 195, - "status": 1, - "organizationalUnitId": 5140, - "cooperateTypes": [ - 9, - 11 - ] -} \ No newline at end of file + "id":528900 +} + +### \ No newline at end of file diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java index eb3225d..5e6bfef 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/dao/orgjob/entity/OrgJob.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; import lombok.experimental.Accessors; @@ -29,6 +31,12 @@ public class OrgJob implements Serializable { /** * 主键 */ + /** + * 主键 + */ + @TableId( + type = IdType.AUTO + ) private Long id; /**