|
|
@@ -41,8 +41,8 @@ public class JcebQueryUtil {
|
|
|
List<SysRole> roles = user.getRoles();
|
|
|
if(CollectionUtils.isNotEmpty(roles)){
|
|
|
for(SysRole role : roles){
|
|
|
- log.debug("@_@ role.getRoleName = {} ^_^", role.getRoleName());
|
|
|
PostTypeEnum tmpPostType = PostTypeEnum.ofRoleName(role.getRoleName());
|
|
|
+ log.debug("@_@ role.getRoleName = {} ^_^", tmpPostType.getCode());
|
|
|
if(PostTypeEnum.isCateNary(tmpPostType) && role.getDataScope().compareTo(scope) < 0){
|
|
|
scope = role.getDataScope();
|
|
|
postType = tmpPostType;
|
|
|
@@ -85,8 +85,8 @@ public class JcebQueryUtil {
|
|
|
}
|
|
|
|
|
|
public static void setBusJcebQuery(JcebQueryVo query){
|
|
|
- log.info("#$#$#$#$ ---- JcebQueryVo.submitState = {}", query.getSubmitState());
|
|
|
- log.info("#$#$#$#$ ---- JcebQueryVo = {}", query);
|
|
|
+ log.info("---- JcebQueryVo.submitState = {}", query.getSubmitState());
|
|
|
+ log.info("---- JcebQueryVo = {}", query);
|
|
|
JcebQueryParamVo jcebQuery = getJcebQuery();
|
|
|
query.setSubmitState(jcebQuery.getSubmitState());
|
|
|
query.setDeptId(jcebQuery.getDeptId());
|