From 1c9dce7c0ba0027cfa3df3ac90a9a8f7accf9ae3 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 13 Jan 2023 09:46:37 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/organization/entity/company/dto/CompListDTO.java | 2 +- .../organization/entity/department/dto/DepartmentListDTO.java | 2 +- .../organization/service/impl/HrmResourceServiceImpl.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index f7a925aa..6b017273 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -61,7 +61,7 @@ public class CompListDTO { /** * 禁用标记 */ - @TableTitle(title = "封存", dataIndex = "canceled", key = "canceled") + @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled") private Integer canceled; /** diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index a6ed69df..ea3da8b4 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -79,7 +79,7 @@ public class DepartmentListDTO { /** * 禁用标记 */ - @TableTitle(title = "封存", dataIndex = "canceled", key = "canceled") + @TableTitle(title = "启用", dataIndex = "canceled", key = "canceled") private int canceled; /** * 操作列 diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index e720c98c..2983cf38 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -541,7 +541,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic DBType dbType = DBType.get(new RecordSet().getDBType()); - //String sqlWhere = ""; StringBuilder sb = new StringBuilder(" where 1=1 "); for (Map.Entry entry : params.entrySet()) { String value = Util.null2String(entry.getValue()); @@ -553,8 +552,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic sb.append(" and t.lastname ").append(dbType.like(value)); } SearchConditionItem searchConditionItem = allFieldsMap.get(key); - buildDynamicSql(searchConditionItem, key, value, sb, dbType); // 根据不同的类型,不同的查询方式 + buildDynamicSql(searchConditionItem, key, value, sb, dbType); } if (searchJobTitle) { String jobTitleIds = StringUtils.join(jobTitleList, ",");