|
@@ -555,6 +555,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
List<Integer> formIds = companyReportList.stream().map(CompanyReport::getReportFormId).collect(Collectors.toList());
|
|
List<Integer> formIds = companyReportList.stream().map(CompanyReport::getReportFormId).collect(Collectors.toList());
|
|
if (functionIdList.size() > 0) {
|
|
if (functionIdList.size() > 0) {
|
|
//根据功能id获取可用的操作代码
|
|
//根据功能id获取可用的操作代码
|
|
|
|
+ if (formIds.size() == 0) {
|
|
|
|
+ formIds.add(-1);
|
|
|
|
+ }
|
|
QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper1->wrapper1.isNull("report_form_id").or().in("report_form_id",formIds)).and(wrapper->{
|
|
QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper1->wrapper1.isNull("report_form_id").or().in("report_form_id",formIds)).and(wrapper->{
|
|
wrapper.eq("package_time", 1);
|
|
wrapper.eq("package_time", 1);
|
|
if (company.getPackageProject() == 1) {
|
|
if (company.getPackageProject() == 1) {
|