|
@@ -10,6 +10,8 @@ import org.apache.shiro.SecurityUtils;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
import org.jeecg.modules.ctop.entity.Project;
|
|
import org.jeecg.modules.ctop.entity.Project;
|
|
import org.jeecg.modules.ctop.service.IProjectService;
|
|
import org.jeecg.modules.ctop.service.IProjectService;
|
|
|
|
+import org.jeecg.modules.system.entity.SysUser;
|
|
|
|
+import org.jeecg.modules.system.service.ISysUserService;
|
|
import org.jeecg.modules.wps.config.Context;
|
|
import org.jeecg.modules.wps.config.Context;
|
|
import org.jeecg.modules.wps.dto.*;
|
|
import org.jeecg.modules.wps.dto.*;
|
|
import org.jeecg.modules.wps.entity.*;
|
|
import org.jeecg.modules.wps.entity.*;
|
|
@@ -47,6 +49,8 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
|
|
private IWpsUserService wpsUserService;
|
|
private IWpsUserService wpsUserService;
|
|
@Autowired
|
|
@Autowired
|
|
private WpsUtil wpsUtil;
|
|
private WpsUtil wpsUtil;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ISysUserService sysUserService;
|
|
|
|
|
|
private static final String OSS_URL_PREFIX = "https://ctop-media.oss-cn-beijing.aliyuncs.com/script-lib/wps/";
|
|
private static final String OSS_URL_PREFIX = "https://ctop-media.oss-cn-beijing.aliyuncs.com/script-lib/wps/";
|
|
@Override
|
|
@Override
|
|
@@ -154,10 +158,11 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
|
|
BeanUtils.copyProperties(watermarkEntity,watermark);
|
|
BeanUtils.copyProperties(watermarkEntity,watermark);
|
|
}
|
|
}
|
|
//获取user
|
|
//获取user
|
|
- WpsUser wpsUser = wpsUserService.getById(userId);
|
|
|
|
|
|
+ SysUser loginUser = sysUserService.getById(userId);
|
|
UserDTO user = new UserDTO();
|
|
UserDTO user = new UserDTO();
|
|
- if (wpsUser != null){
|
|
|
|
- BeanUtils.copyProperties(wpsUser,user);
|
|
|
|
|
|
+ if (loginUser != null){
|
|
|
|
+ user.setId(loginUser.getId());
|
|
|
|
+ user.setName(loginUser.getRealname());
|
|
user.setPermission(permission);
|
|
user.setPermission(permission);
|
|
}
|
|
}
|
|
|
|
|