diff --git a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java index 47907bb..d745d74 100644 --- a/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java +++ b/mdp-form/src/main/java/com/mdp/form/ctrl/FormDataController.java @@ -84,19 +84,19 @@ public class FormDataController { boolean roleCheckOk=false; boolean useridCheckOk=false; boolean deptidCheckOk=false; - if(ObjectTools.isNotEmpty(formQx.getQRoleids())){ - if(LoginUtils.hasAnyRoles(formQx.getQRoleids().split(","))){ + if(ObjectTools.isNotEmpty(formQx.getQryRoleids())){ + if(LoginUtils.hasAnyRoles(formQx.getQryRoleids().split(","))){ roleCheckOk=true; } } - if(ObjectTools.isNotEmpty(formQx.getQUserids())){ - if(Arrays.stream(formQx.getQUserids().split(",")).filter(k->user.getUserid().equals(k)).findAny().isPresent()){ + if(ObjectTools.isNotEmpty(formQx.getQryUserids())){ + if(Arrays.stream(formQx.getQryUserids().split(",")).filter(k->user.getUserid().equals(k)).findAny().isPresent()){ useridCheckOk=true; } } - if(ObjectTools.isNotEmpty(formQx.getQDeptids())){ - if(Arrays.stream(formQx.getQDeptids().split(",")).filter(k->user.getDeptid().equals(k)).findAny().isPresent()){ + if(ObjectTools.isNotEmpty(formQx.getQryDeptids())){ + if(Arrays.stream(formQx.getQryDeptids().split(",")).filter(k->user.getDeptid().equals(k)).findAny().isPresent()){ deptidCheckOk=true; } } @@ -123,7 +123,7 @@ public class FormDataController { if( notAllow ){ return Result.error("no-qx-query","无权限查询"); }else if(!allowCheckOk){//如果被允许的任意条款满足,则允许 - if(ObjectTools.isNotEmpty(formQx.getQRoleids())||ObjectTools.isNotEmpty(formQx.getQDeptids())||ObjectTools.isNotEmpty(formQx.getQUserids())){ + if(ObjectTools.isNotEmpty(formQx.getQryRoleids())||ObjectTools.isNotEmpty(formQx.getQryDeptids())||ObjectTools.isNotEmpty(formQx.getQryUserids())){ return Result.error("no-qx-query","无权限查询"); } }