From 741190b2835f5f46aaab50dcab4b7db878ee8f4d Mon Sep 17 00:00:00 2001
From: kangxiaoshan <475914010@qq.com>
Date: Thu, 17 Oct 2019 17:18:07 +0800
Subject: [PATCH] 权限管理
---
src/main/java/common/service/impl/AuthServiceImpl.java | 5 ++---
src/main/java/common/service/impl/ContractServiceImpl.java | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/common/service/impl/AuthServiceImpl.java b/src/main/java/common/service/impl/AuthServiceImpl.java
index c12e4fd..ce4f7f7 100644
--- a/src/main/java/common/service/impl/AuthServiceImpl.java
+++ b/src/main/java/common/service/impl/AuthServiceImpl.java
@@ -38,10 +38,9 @@ public class AuthServiceImpl implements AuthService {
if(RoleEnum.FINANCE.getKey().equals(loginAccount.getRole())){
//财务 按签约主体查看
- List bodyids = JSONArray.fromObject(auth.getAuthExtend());
-
- authArrs = contractBodyRepository.findByIds(bodyids);
+ authArrs = JSONArray.fromObject(auth.getAuthExtend());
+// authArrs = contractBodyRepository.findByIds(bodyids);
}else if(RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())){
//销售 按签约合同人查看
diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java
index 330fda5..830cd42 100644
--- a/src/main/java/common/service/impl/ContractServiceImpl.java
+++ b/src/main/java/common/service/impl/ContractServiceImpl.java
@@ -1094,15 +1094,15 @@ public class ContractServiceImpl implements ContractService {
// List bodyids = Arrays.asList(loginAccount.getAuthExtend().split(","));
List bodyids = JSONArray.fromObject(auth.getAuthExtend());
- List<String> bodycodes = contractBodyRepository.findByIds(bodyids);
+// List<String> bodycodes = contractBodyRepository.findByIds(bodyids);
if (!StringUtils.isEmpty(contractId)) {
if (ids != null && ids.size() > 0) {
- contractList = contractRepository.findByDsContractBody(startDate, endDate, platforms,bodycodes,ids);
+ contractList = contractRepository.findByDsContractBody(startDate, endDate, platforms,bodyids,ids);
}
} else {
- contractList = contractRepository.findByDsContractBody(startDate, endDate, platform,bodycodes);
+ contractList = contractRepository.findByDsContractBody(startDate, endDate, platform,bodyids);
}
}else if(RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())){
--
libgit2 0.27.1