|
|
@@ -1,28 +1,24 @@
|
|
|
package com.qmrb.system.service.impl;
|
|
|
|
|
|
|
|
|
-
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import cn.hutool.core.lang.Assert;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qmrb.system.converter.ContractPlaceNumberRelHisConverter;
|
|
|
import com.qmrb.system.framework.security.util.SecurityUtils;
|
|
|
+import com.qmrb.system.mapper.ContractPlaceNumberRelHisMapper;
|
|
|
import com.qmrb.system.pojo.entity.ContractPlaceNumberRelHis;
|
|
|
import com.qmrb.system.pojo.entity.SysUser;
|
|
|
import com.qmrb.system.pojo.form.ContractPlaceNumberRelHisForm;
|
|
|
-import com.qmrb.system.pojo.vo.ContractPlaceNumberRelHisVO;
|
|
|
import com.qmrb.system.pojo.query.ContractPlaceNumberRelHisQuery;
|
|
|
-import com.qmrb.system.mapper.ContractPlaceNumberRelHisMapper;
|
|
|
-import com.qmrb.system.pojo.vo.ContractPlaceNumberRelVO;
|
|
|
+import com.qmrb.system.pojo.vo.ContractPlaceNumberRelHisVO;
|
|
|
import com.qmrb.system.service.IContractPlaceNumberRelHisService;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.qmrb.system.service.SysUserService;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
-import cn.hutool.core.lang.Assert;
|
|
|
import jakarta.validation.Valid;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.Duration;
|
|
|
import java.time.LocalDateTime;
|
|
|
@@ -59,7 +55,7 @@ public class ContractPlaceNumberRelHisServiceImpl extends ServiceImpl<ContractPl
|
|
|
// 获取用户角色信息
|
|
|
Set<String> roles = SecurityUtils.getRoles();
|
|
|
String role = "";
|
|
|
- if (roles.contains("ADMIN")) {
|
|
|
+ if (roles.contains("ADMIN")|| roles.contains("TCCGLY")) {
|
|
|
role = "ADMIN";
|
|
|
}
|
|
|
Page<ContractPlaceNumberRelHisVO> pageResult = baseMapper.getPageByRole(new Page<>(pageNum, pageSize), role, sysUser,queryParams);
|
loemkie