|
|
@@ -32,11 +32,9 @@ import org.springblade.core.secure.utils.AuthUtil;
|
|
|
import org.springblade.core.tool.api.R;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
import org.springblade.los.Util.IDeptUtils;
|
|
|
-import org.springblade.los.business.aea.entity.AeaBills;
|
|
|
import org.springblade.los.business.amends.entity.Amends;
|
|
|
import org.springblade.los.business.amends.service.IAmendsService;
|
|
|
import org.springblade.los.business.amends.vo.AmendsVO;
|
|
|
-import org.springblade.los.business.sea.entity.Bills;
|
|
|
import org.springblade.system.feign.ISysClient;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
@@ -108,7 +106,7 @@ public class AmendsController extends BladeController {
|
|
|
if (AuthUtil.getUserRole().contains("操作经理")) {
|
|
|
lambdaQueryWrapper.eq(Amends::getOperatorDept, AuthUtil.getDeptId());
|
|
|
} else if (AuthUtil.getUserRole().contains("操作员")) {
|
|
|
- lambdaQueryWrapper.eq(Amends::getOperatorId, AuthUtil.getUserId());
|
|
|
+ lambdaQueryWrapper.and(i -> i.eq(Amends::getOperatorId, AuthUtil.getUserId()).or().eq(Amends::getCreateUser,AuthUtil.getUserId()));
|
|
|
} else if (AuthUtil.getUserRole().contains("销售经理")) {
|
|
|
lambdaQueryWrapper.eq(Amends::getSrcDeptId, AuthUtil.getDeptId());
|
|
|
} else if (AuthUtil.getUserRole().contains("业务员")) {
|
lijunping