用款申请单列表过滤逻辑优化
This commit is contained in:
parent
e872b0b2d3
commit
94abf8774d
|
@ -82,16 +82,16 @@ public class paymentApplicationListPlugin extends AbstractListPlugin {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if ("zcgj_org.id".equals(key)) {
|
if ("zcgj_org.id".equals(key)) {
|
||||||
String userId = RequestContext.get().getUserId();//获取当前用户id
|
String userid = RequestContext.get().getUserId();//获取当前用户id
|
||||||
boolean superUser = PermissionServiceHelper.isSuperUser(Long.parseLong(userId)); //判断是否为全功能用户
|
List<Long> ids = UserServiceHelper.getOrgsUserJoin(Long.parseLong(userid));//获取用户所有部门id
|
||||||
boolean adminUser = PermissionServiceHelper.isAdminUser(Long.parseLong(userId)); //判断是否管理员用户
|
|
||||||
List<Long> ids = UserServiceHelper.getOrgsUserJoin(Long.parseLong(userId));//获取用户所有部门id
|
|
||||||
List<Long> ids2 = new ArrayList<>();
|
List<Long> ids2 = new ArrayList<>();
|
||||||
if(!superUser && !adminUser){
|
// boolean superUser = PermissionServiceHelper.isSuperUser(Long.parseLong(userId)); //判断是否为全功能用户
|
||||||
HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(userId),true);
|
// boolean adminUser = PermissionServiceHelper.isAdminUser(Long.parseLong(userId)); //判断是否管理员用户
|
||||||
List<Long> hasPermOrgs = userHasPermOrgs.getHasPermOrgs();
|
// if(!superUser && !adminUser){
|
||||||
ids2.addAll(hasPermOrgs);
|
// HasPermOrgResult userHasPermOrgs = PermissionServiceHelper.getUserHasPermOrgs(Long.parseLong(userId),true);
|
||||||
}
|
// List<Long> hasPermOrgs = userHasPermOrgs.getHasPermOrgs();
|
||||||
|
// ids2.addAll(hasPermOrgs);
|
||||||
|
// }
|
||||||
for (Long userMainOrgId : ids) {
|
for (Long userMainOrgId : ids) {
|
||||||
QFilter[] qFilter = new QFilter[]{new QFilter("id", QCP.equals, userMainOrgId)};
|
QFilter[] qFilter = new QFilter[]{new QFilter("id", QCP.equals, userMainOrgId)};
|
||||||
DynamicObject org = BusinessDataServiceHelper.loadSingle("bos_adminorg", qFilter);//行政组织
|
DynamicObject org = BusinessDataServiceHelper.loadSingle("bos_adminorg", qFilter);//行政组织
|
||||||
|
|
Loading…
Reference in New Issue