|
|
@@ -678,20 +678,37 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
if (i.getCname()!=null)map.put("cname", i.getCname());
|
|
|
if (i.getPname()!=null)map.put("pname", i.getPname());
|
|
|
if (i.getStatus()!=null)map.put("status", i.getStatus());
|
|
|
+ permissionsGrade(i, map);
|
|
|
+ Pagination<outPaymentList> p=(Pagination<outPaymentList>)findPage("selectPaymentList","selectPaymentCount",
|
|
|
+ map,i.getPageNo(),i.getPageSize());
|
|
|
+ return p;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 设置查看逻辑
|
|
|
+ * @param i
|
|
|
+ * @param map
|
|
|
+ */
|
|
|
+ private void permissionsGrade(InputPaymentList i, Map<String, Object> map) {
|
|
|
//0=财务专员 1=财务经理 2=管理层 3=咨询师与经理 4=专利管理员
|
|
|
- Integer lvl=i.getPermissionsGrade();
|
|
|
- if (lvl==2){
|
|
|
+ Integer lvl=0;
|
|
|
+ if(i.getPermissionsGrade()!=null)lvl= i.getPermissionsGrade();
|
|
|
+ //1和2都为查看用角色区分
|
|
|
+ if (lvl==1){
|
|
|
//这些角色可以查看全部,反之不能,所以取反
|
|
|
- if (!((TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
+ //财务经理查看
|
|
|
+ lvl=1;
|
|
|
+ }else if (((TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
|
|
|
TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
|
|
|
TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)))){
|
|
|
+ lvl=2;
|
|
|
+ }else {
|
|
|
throw new BusinessException("查询异常");
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
map.put("lvl",lvl);
|
|
|
- Pagination<outPaymentList> p=(Pagination<outPaymentList>)findPage("selectPaymentList","selectPaymentCount",
|
|
|
- map,i.getPageNo(),i.getPageSize());
|
|
|
- return p;
|
|
|
}
|
|
|
|
|
|
|