From 13c39d5fd0c103261efd5f7e45721287be9fd08e Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 21 Jun 2023 11:42:21 +0800 Subject: [PATCH] =?UTF-8?q?Resin=E7=BC=96=E8=AF=91=20=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E3=80=81=E8=AD=A6=E5=91=8A=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/browser/po/CustomBrowserBean.java | 6 +- .../entity/company/param/CompParam.java | 6 +- .../department/param/DeptSearchParam.java | 6 +- .../param/QuerySingleDeptListParam.java | 6 +- .../param/HrmResourceSearchParam.java | 6 +- .../entity/job/param/JobSearchParam.java | 6 +- .../entity/searchtree/SearchTree.java | 66 ++++++++++++++++++- .../mapper/department/DepartmentMapper.xml | 2 +- .../service/impl/ExportCommonServiceImpl.java | 5 +- .../organization/util/page/PageInfo.java | 2 + .../util/response/ReturnResult.java | 66 ------------------- .../web/HrmResourceController.java | 2 +- 12 files changed, 83 insertions(+), 96 deletions(-) diff --git a/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java b/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java index 7885d1de..b34ac32d 100644 --- a/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java +++ b/src/com/engine/organization/entity/browser/po/CustomBrowserBean.java @@ -1,10 +1,7 @@ package com.engine.organization.entity.browser.po; import com.api.browser.bean.BrowserBean; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.Map; @@ -17,6 +14,7 @@ import java.util.Map; @Builder @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper=false) public class CustomBrowserBean extends BrowserBean { diff --git a/src/com/engine/organization/entity/company/param/CompParam.java b/src/com/engine/organization/entity/company/param/CompParam.java index 1b409c23..37f40917 100644 --- a/src/com/engine/organization/entity/company/param/CompParam.java +++ b/src/com/engine/organization/entity/company/param/CompParam.java @@ -1,10 +1,7 @@ package com.engine.organization.entity.company.param; import com.engine.organization.common.BaseQueryParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * @author:dxfeng @@ -15,6 +12,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper=false) public class CompParam extends BaseQueryParam { private Integer Id; private String subCompanyName; diff --git a/src/com/engine/organization/entity/department/param/DeptSearchParam.java b/src/com/engine/organization/entity/department/param/DeptSearchParam.java index 93b53094..099edd5a 100644 --- a/src/com/engine/organization/entity/department/param/DeptSearchParam.java +++ b/src/com/engine/organization/entity/department/param/DeptSearchParam.java @@ -1,10 +1,7 @@ package com.engine.organization.entity.department.param; import com.engine.organization.common.BaseQueryParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * @description: @@ -16,6 +13,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper=false) public class DeptSearchParam extends BaseQueryParam { private Integer id; private String departmentMark; diff --git a/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java b/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java index 9972fa6c..b0b25607 100644 --- a/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java +++ b/src/com/engine/organization/entity/department/param/QuerySingleDeptListParam.java @@ -1,10 +1,7 @@ package com.engine.organization.entity.department.param; import com.engine.organization.common.BaseQueryParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * @Author weaver_cl @@ -16,6 +13,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper=false) public class QuerySingleDeptListParam extends BaseQueryParam { private Integer parentComp; diff --git a/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java b/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java index b3cb3006..8a549ea9 100644 --- a/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java +++ b/src/com/engine/organization/entity/hrmresource/param/HrmResourceSearchParam.java @@ -1,10 +1,7 @@ package com.engine.organization.entity.hrmresource.param; import com.engine.organization.common.BaseQueryParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * @author:dxfeng @@ -15,6 +12,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper=false) public class HrmResourceSearchParam extends BaseQueryParam { /** * 姓名 diff --git a/src/com/engine/organization/entity/job/param/JobSearchParam.java b/src/com/engine/organization/entity/job/param/JobSearchParam.java index 77ebc80f..fd1871f4 100644 --- a/src/com/engine/organization/entity/job/param/JobSearchParam.java +++ b/src/com/engine/organization/entity/job/param/JobSearchParam.java @@ -1,10 +1,7 @@ package com.engine.organization.entity.job.param; import com.engine.organization.common.BaseQueryParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * @description: @@ -16,6 +13,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@EqualsAndHashCode(callSuper=false) public class JobSearchParam extends BaseQueryParam { /** * 主键 diff --git a/src/com/engine/organization/entity/searchtree/SearchTree.java b/src/com/engine/organization/entity/searchtree/SearchTree.java index ddb769e6..849670cf 100644 --- a/src/com/engine/organization/entity/searchtree/SearchTree.java +++ b/src/com/engine/organization/entity/searchtree/SearchTree.java @@ -1,7 +1,6 @@ package com.engine.organization.entity.searchtree; import com.api.hrm.bean.TreeNode; -import lombok.Data; import java.util.Objects; @@ -11,7 +10,6 @@ import java.util.Objects; * @createTime: 2022/05/26 * @version: 1.0 */ -@Data public class SearchTree extends TreeNode { private String companyid; private String isVirtual; @@ -22,6 +20,70 @@ public class SearchTree extends TreeNode { private String parentComp; private Integer orderNum; + public String getCompanyid() { + return companyid; + } + + public void setCompanyid(String companyid) { + this.companyid = companyid; + } + + public String getIsVirtual() { + return isVirtual; + } + + public void setIsVirtual(String isVirtual) { + this.isVirtual = isVirtual; + } + + public String getPsubcompanyid() { + return psubcompanyid; + } + + public void setPsubcompanyid(String psubcompanyid) { + this.psubcompanyid = psubcompanyid; + } + + public String getDisplayType() { + return displayType; + } + + public void setDisplayType(String displayType) { + this.displayType = displayType; + } + + public boolean isCanceled() { + return isCanceled; + } + + public void setCanceled(boolean canceled) { + isCanceled = canceled; + } + + public String getRequestParams() { + return requestParams; + } + + public void setRequestParams(String requestParams) { + this.requestParams = requestParams; + } + + public String getParentComp() { + return parentComp; + } + + public void setParentComp(String parentComp) { + this.parentComp = parentComp; + } + + public Integer getOrderNum() { + return orderNum; + } + + public void setOrderNum(Integer orderNum) { + this.orderNum = orderNum; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml index fda56e2a..a21e4c44 100644 --- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml +++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml @@ -145,7 +145,7 @@ from jcl_org_job where forbidden_tag = 0 and delete_type = 0 - and parent_dept = = #{supDepId} + and parent_dept = #{supDepId}