提交 131e72b0 authored 作者: 吕本才's avatar 吕本才

1、升级积木大屏和报表到1.9.4版本

上级 34547d10
......@@ -16,8 +16,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@EnableCustomConfig
@Slf4j
@EnableRyFeignClients
@MapperScan(value = {"org.jeecg.modules.jmreport.dao","org.jeecg.modules.drag.dao","com.link.report.domain.mapper"})
@SpringBootApplication(scanBasePackages = {"org.jeecg.modules.jmreport", "com.link.report","org.jeecg.modules.drag"})
@MapperScan(value = {"com.link.report.domain.mapper"})
@SpringBootApplication(scanBasePackages = { "com.link.report","org.jeecg","org.jeecg.modules.drag.dao"})
public class WangxiaoluLinkModuleReportApplication {
public static void main(String[] args) {
......
//package com.link.report.service.impl;
//
//import com.alibaba.fastjson.JSONObject;
//import lombok.extern.slf4j.Slf4j;
//import org.jeecg.common.api.dto.LogDTO;
//import org.jeecg.common.system.api.ISysBaseAPI;
//import org.jeecg.common.system.vo.DictModel;
//import org.jeecg.common.util.oConvertUtils;
//import org.jeecg.modules.base.service.BaseCommonService;
//import org.jeecg.modules.drag.service.IOnlDragExternalService;
//import org.jeecg.modules.drag.vo.DragDictModel;
//import org.jeecg.modules.drag.vo.DragLogDTO;
//import org.springframework.beans.BeanUtils;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Lazy;
//import org.springframework.stereotype.Service;
//import org.springframework.util.CollectionUtils;
//
//import java.util.ArrayList;
//import java.util.HashMap;
//import java.util.List;
//import java.util.Map;
//
///**
// * @Description: 字典处理
// * @Author: lsq
// * @Date:2023-01-09
// * @Version:V1.0
// */
//@Slf4j
//@Service("onlDragExternalServiceImpl")
//public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
//
//}
package com.link.report.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.sfa.common.core.utils.ServletUtils;
import com.sfa.common.security.service.TokenService;
import com.sfa.common.security.utils.SecurityUtils;
......@@ -58,6 +59,13 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
public String[] getRoles(String s) {
LoginUser loginUser = tokenService.getLoginUser(s);
Set<String> roles = loginUser.getRoles();
// it可以设计任何报表
if (!ObjectUtil.isAllNotEmpty( loginUser.getSysUser(),loginUser.getSysUser().getDept()
,loginUser.getSysUser().getDept().getDeptName()) &&
// 信息中心可以编辑所有报表
loginUser.getSysUser().getDept().getDeptName().contains("信息技术中心")) {
roles.add("admin");
}
return roles.toArray(new String[0]);
}
......@@ -104,10 +112,11 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
//具备admin或者管理员权限才可访问所有报表
if (SecurityUtils.isAdmin(loginUser.getUserid())
|| loginUser.getRoles().contains("it")
|| loginUser.getRoles().contains("manger")) {
return "";
// 信息中心可以编辑所有报表
|| loginUser.getSysUser().getDept().getDeptName().contains("信息技术中心")) {
return "1";
}
return loginUser.getUsername();
return loginUser.getSysUser().getDept().getDeptName();
}
@Override
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论