yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门视图代码回滚，只上线总部下人员，默认取二级部门逻辑

Browse Source
This commit is contained in:
yujh 2025-03-21 20:57:10 +08:00
parent 9d28c5a65d
commit 926d3d7a94
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java
View File

@ -1635,9 +1635,9 @@ public class DataViewService
ro.put("personInfos", currentLoginMaps);
System.out.println("SDK.getPortalAPI().getUserPhoto(uc, uc.getUID()) = " + SDK.getPortalAPI().getUserPhoto(uc, uc.getUID()));
ro.put("userPhoto",SDK.getPortalAPI().getUserPhoto(uc, uc.getUID()));
//获取前端默认查询部门ID，这里改成过去事业部ID或者职能部门（总部下二级部门）
//获取前端默认查询部门ID，这里改成总部的话取二级职能部门（总部下二级部门）
DepartmentModel departmentModel = uc.getDepartmentModel();
String divisionDepartmentId = getDivisionDepartment(departmentModel);
String divisionDepartmentId = getHeadSubDepartments(departmentModel);
System.out.println(">>>>>>>>>>>>getDivisionDepartment(departmentModel) = " + divisionDepartmentId);
ro.put("departmentId",divisionDepartmentId);
List<RowMap> deptMaps = DBSql.getMaps("SELECT ID,PARENTDEPARTMENTID,DEPARTMENTNAME,LAYER,ORDERINDEX FROM ORGDEPARTMENT WHERE COMPANYID='8911e732-b42a-4556-853f-ad32761bcbee' AND CLOSED='0' AND DEPARTMENTNAME NOT IN ('澳优','系统管理','项目开发人员部门','奶酪事业部','离退人员部门','集团领导')", new Object[0]);
@ -2626,11 +2626,12 @@ public class DataViewService
if(UtilString.isEmpty(deptString) || deptString.equals("[]")){
return false;
}
/*String[] deptArray = model.getExt6().split(",");
String[] deptArray = model.getExt6().split(",");
if (Arrays.stream(deptArray).noneMatch(deptString::contains)) {
return false;
}*/
String[] deptArray = model.getExt6().split(",");
}
//逻辑还原暂定
/*String[] deptArray = model.getExt6().split(",");
boolean flag = false;
for (String deptId : deptArray) {
DepartmentModel departmentModel = SDK.getORGAPI().getDepartmentById(deptId);
@ -2643,13 +2644,32 @@ public class DataViewService
}
}
}
return flag;
return flag;*/
}
return true;
}
/**
* 获取总部下二级部门
* @param departmentModel
* @return
*/
public String getHeadSubDepartments(DepartmentModel departmentModel){
String pathIdOfCache = departmentModel.getPathIdOfCache();
String headquartersDepartmentId = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.reportform", "headquartersDepartmentId");
if(pathIdOfCache.contains(headquartersDepartmentId)){//如果是在总部下
//5c8e2d14-25a8-4baf-aa3a-344064007ef3/3471e078-adf7-4e48-8f2f-3a7f58df8cb5/595df8a3-0254-4f01-bf5c-c6b90d67cfa7/
String[] deptList = pathIdOfCache.split("/");
if(deptList.length>2){
return deptList[1];
}
}
return departmentModel.getId();
}
/**
* 获取事业部部门或者总部下二级部门（职能部门）
* 暂时不用了
* @param departmentModel
* @return
*/