Commit 741190b2 by kangxiaoshan

权限管理

parent 62ae0618
...@@ -38,10 +38,9 @@ public class AuthServiceImpl implements AuthService { ...@@ -38,10 +38,9 @@ public class AuthServiceImpl implements AuthService {
if(RoleEnum.FINANCE.getKey().equals(loginAccount.getRole())){ if(RoleEnum.FINANCE.getKey().equals(loginAccount.getRole())){
//财务 按签约主体查看 //财务 按签约主体查看
List bodyids = JSONArray.fromObject(auth.getAuthExtend()); authArrs = JSONArray.fromObject(auth.getAuthExtend());
authArrs = contractBodyRepository.findByIds(bodyids);
// authArrs = contractBodyRepository.findByIds(bodyids);
}else if(RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())){ }else if(RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())){
//销售 按签约合同人查看 //销售 按签约合同人查看
......
...@@ -1094,15 +1094,15 @@ public class ContractServiceImpl implements ContractService { ...@@ -1094,15 +1094,15 @@ public class ContractServiceImpl implements ContractService {
// List bodyids = Arrays.asList(loginAccount.getAuthExtend().split(",")); // List bodyids = Arrays.asList(loginAccount.getAuthExtend().split(","));
List bodyids = JSONArray.fromObject(auth.getAuthExtend()); List bodyids = JSONArray.fromObject(auth.getAuthExtend());
List<String> bodycodes = contractBodyRepository.findByIds(bodyids); // List<String> bodycodes = contractBodyRepository.findByIds(bodyids);
if (!StringUtils.isEmpty(contractId)) { if (!StringUtils.isEmpty(contractId)) {
if (ids != null && ids.size() > 0) { if (ids != null && ids.size() > 0) {
contractList = contractRepository.findByDsContractBody(startDate, endDate, platforms,bodycodes,ids); contractList = contractRepository.findByDsContractBody(startDate, endDate, platforms,bodyids,ids);
} }
} else { } else {
contractList = contractRepository.findByDsContractBody(startDate, endDate, platform,bodycodes); contractList = contractRepository.findByDsContractBody(startDate, endDate, platform,bodyids);
} }
}else if(RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())){ }else if(RoleEnum.SALSEMAN.getKey().equals(loginAccount.getRole())){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment