|
|
@ -272,7 +272,17 @@ public class HrmTreeService extends BaseBean{
|
|
|
|
orgBean.setIcon("icon-coms-LargeArea");
|
|
|
|
orgBean.setIcon("icon-coms-LargeArea");
|
|
|
|
orgBean.setCanceled("1".equals(rs.getCompanyiscanceled()));
|
|
|
|
orgBean.setCanceled("1".equals(rs.getCompanyiscanceled()));
|
|
|
|
//orgBean.setCanClick(!this.isLoadSubDepartment);
|
|
|
|
//orgBean.setCanClick(!this.isLoadSubDepartment);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//安科讯二开增加人数统计分部
|
|
|
|
|
|
|
|
RecordSet rst = new RecordSet();
|
|
|
|
|
|
|
|
rst.executeQuery("select rstj from hrmsubcompanydefined where subcomid = ?",id);
|
|
|
|
|
|
|
|
rst.next();
|
|
|
|
|
|
|
|
Integer rstj = Util.getIntValue(rst.getString("rstj"),0);
|
|
|
|
|
|
|
|
orgBean.setCount(rstj);
|
|
|
|
|
|
|
|
|
|
|
|
orgBean.setCanClick(isOrgTree);
|
|
|
|
orgBean.setCanClick(isOrgTree);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!this.isLoadSubDepartment){
|
|
|
|
if(!this.isLoadSubDepartment){
|
|
|
|
orgBean.setTitle(getAllParentsOrg(id,"0"));
|
|
|
|
orgBean.setTitle(getAllParentsOrg(id,"0"));
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -482,6 +492,13 @@ public class HrmTreeService extends BaseBean{
|
|
|
|
orgBean.setPsubcompanyid(pSubCompany.getId());
|
|
|
|
orgBean.setPsubcompanyid(pSubCompany.getId());
|
|
|
|
orgBean.setIcon("icon-coms-Branch");
|
|
|
|
orgBean.setIcon("icon-coms-Branch");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//安科讯二开增加人数统计部门
|
|
|
|
|
|
|
|
RecordSet rst = new RecordSet();
|
|
|
|
|
|
|
|
rst.executeQuery("select rstj from hrmdepartmentdefined where deptid = ?",id);
|
|
|
|
|
|
|
|
rst.next();
|
|
|
|
|
|
|
|
Integer rstj = Util.getIntValue(rst.getString("rstj"),0);
|
|
|
|
|
|
|
|
orgBean.setCount(rstj);
|
|
|
|
|
|
|
|
|
|
|
|
pSubCompany.setIsParent(true);
|
|
|
|
pSubCompany.setIsParent(true);
|
|
|
|
if (pDepartment != null) {
|
|
|
|
if (pDepartment != null) {
|
|
|
|
pDepartment.setIsParent(true);
|
|
|
|
pDepartment.setIsParent(true);
|
|
|
@ -1118,6 +1135,16 @@ public class HrmTreeService extends BaseBean{
|
|
|
|
private String displayType;
|
|
|
|
private String displayType;
|
|
|
|
private boolean isCanceled;
|
|
|
|
private boolean isCanceled;
|
|
|
|
private String requestParams;//头像信息
|
|
|
|
private String requestParams;//头像信息
|
|
|
|
|
|
|
|
private Integer count; //安科讯二开人数统计
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Integer getCount() {
|
|
|
|
|
|
|
|
return count;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public void setCount(Integer count) {
|
|
|
|
|
|
|
|
this.count = count;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public String getCompanyid() {
|
|
|
|
public String getCompanyid() {
|
|
|
|
return companyid;
|
|
|
|
return companyid;
|
|
|
|