From bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab Mon Sep 17 00:00:00 2001 From: ke <893754509@qq.com> Date: Tue, 03 Dec 2024 09:53:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev --- skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java index dd97467..6e68c09 100644 --- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java +++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java @@ -54,12 +54,17 @@ /** * 用户所在单位 */ - private List<Long> userUnit; + private List<String> userUnit; /** * 县单位位 */ - private List<Long> countryUnit; + private List<String> countryUnit; + private List<String> selfUnit; + /** + * 设备施工单位 + */ + private List<String> sgUnit; /** * 用户角色 @@ -155,10 +160,15 @@ * 部门ID */ private String deptId; + private String othRegCd; /** * 是否单位过滤 1不过滤 */ private Integer isUnit; + /** + * 施工单位 + */ +// private String selfUnit; } -- Gitblit v1.9.3