diff --git a/src/com/api/organization/listener/InitListener.java b/src/com/api/organization/listener/InitListener.java index 11de1569..eb53ceb6 100644 --- a/src/com/api/organization/listener/InitListener.java +++ b/src/com/api/organization/listener/InitListener.java @@ -18,6 +18,9 @@ public class InitListener implements AbstractResourceModelListener { int menuid = 100139; BaseBean bb = new BaseBean(); String cId = new License().getCId(); + if(cId.length() > 7) { + cId = cId.substring(cId.length() - 7); + } String defaultCloseNonStandard151 = bb.getPropValue("hrmOrganization", "defaultCloseNonStandard151"); if(StringUtils.isNotBlank(cId) && "true".equals(defaultCloseNonStandard151)) { int cid = Integer.parseInt(cId); diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index a2d3baef..840c6845 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -456,7 +456,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic } }else { rs.executeQuery("select h.id,h.workcode,h.lastname,h.sex,h.departmentid,h.subcompanyid1,h.jobtitle,h.status,h.mobile " + - " from hrmresourcevirtual v left join hrmresource h on v.resourceid = h.id and v.virtualtype = ? and h.departmentid = ?",versionId,departmentId); + " from hrmresourcevirtual v inner join hrmresource h on v.resourceid = h.id and v.virtualtype = ? and h.departmentid = ?",versionId,departmentId); while (rs.next()) { ResourceChartPO build = ResourceChartPO.builder() .id((long) Util.getIntValue(rs.getString("id"))) @@ -466,8 +466,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic .departmentId(Util.getIntValue(rs.getString("departmentid"))) .subcompanyid1(Util.getIntValue(rs.getString("subcompanyid1"))) .jobTitle(Util.getIntValue(rs.getString("jobtitle"))) - .status(Util.getIntValue(rs.getString("subcompanyid1"))) - .mobile(Util.null2String(rs.getString("subcompanyid1"))) + .status(Util.getIntValue(rs.getString("status"))) + .mobile(Util.null2String(rs.getString("mobile"))) .build(); resourceChartPOS.add(build); }