liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'BUG修复' (#141) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/141
This commit is contained in:
dxfeng 2023-01-13 09:48:52 +08:00
parent 2fba3b50b9 1bb7b67133
commit 52c02986c8
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/company/dto/CompListDTO.java
View File

@ -61,7 +61,7 @@ public class CompListDTO {
/**
* 禁用标记
*/
@TableTitle(title = "封存", dataIndex = "canceled", key = "canceled")
@TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
private Integer canceled;
/**

2
src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
View File

@ -79,7 +79,7 @@ public class DepartmentListDTO {
/**
* 禁用标记
*/
@TableTitle(title = "封存", dataIndex = "canceled", key = "canceled")
@TableTitle(title = "启用", dataIndex = "canceled", key = "canceled")
private int canceled;
/**
* 操作列

3
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -567,7 +567,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<String, Object> entry : params.entrySet()) {
String value = Util.null2String(entry.getValue());
@ -579,8 +578,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, ",");