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

组织透视下拉框BUG

This commit is contained in:
dxfeng 2022-11-15 14:34:16 +08:00
parent 4fc2eca27b
commit 2d64a5015b
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/engine/organization/service/impl/OrgChartServiceImpl.java
View File

@ -50,19 +50,19 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
item.put("companyname", rs.getString("companyname"));
fclasslist.add(item);
}
String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) order by ftype , id,fdateend desc ";
String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) ";
// 分部分权过滤
DetachUtil detachUtil = new DetachUtil(user.getUID());
if (detachUtil.isDETACH()) {
String jclRoleLevels = detachUtil.getJclRoleLevels();
if (StringUtils.isNotBlank(jclRoleLevels)) {
sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid in(" + jclRoleLevels + "))) order by ftype , id,fdateend desc";
sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid in(" + jclRoleLevels + "))) ";
} else {
sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0 order by ftype , id,fdateend desc";
sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0 ";
}
}
rs.executeQuery(sql);
rs.executeQuery(sql + " and fdateend > " + DBType.get(new RecordSet().getDBType()).currentDate() + " order by ftype , id,fdateend desc ");
Set<OrgSelectItem> companySet = new HashSet<>();
while (rs.next()) {
OrgSelectItem item = new OrgSelectItem();

2
src/com/engine/organization/util/db/DBOperateAdapter.java
View File

@ -4,4 +4,6 @@ public interface DBOperateAdapter {
String like(String some);
String concat(String some);
String currentDate();
}

15
src/com/engine/organization/util/db/DBType.java
View File

@ -15,6 +15,11 @@ public enum DBType implements DBOperateAdapter {
public String concat(String some) {
return " concat(','," + some + ",',') ";
}
@Override
public String currentDate() {
return "now()";
}
},
SQLSERVER("sqlserver") {
@Override
@ -26,6 +31,11 @@ public enum DBType implements DBOperateAdapter {
public String concat(String some) {
return " ','+" + some + "+',' ";
}
@Override
public String currentDate() {
return "GETDATE()";
}
},
ORACLE("oracle") {
@Override
@ -37,6 +47,11 @@ public enum DBType implements DBOperateAdapter {
public String concat(String some) {
return " ',' ||" + some + "|| ',' ";
}
@Override
public String currentDate() {
return "SYSDATE";
}
};
private String dbtype;