|
|
@@ -13,6 +13,7 @@ import java.util.UUID;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
+import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.*;
|
|
|
import com.goafanti.order.enums.ProjectType;
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
@@ -677,20 +678,17 @@ 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());
|
|
|
- if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
|
|
|
- map.put("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)) {
|
|
|
- map.put("lvl", 2);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.TECH)||TokenManager.hasRole(AFTConstants.TECH_MANAGER)) {
|
|
|
- map.put("lvl", 3);
|
|
|
- }else if(TokenManager.hasRole(AFTConstants.PATENT_AUDITOR))
|
|
|
- {
|
|
|
- map.put("lvl", 4);
|
|
|
- }else {
|
|
|
- map.put("lvl", 0);
|
|
|
+ //0=财务专员 1=财务经理 2=管理层 3=咨询师与经理 4=专利管理员
|
|
|
+ Integer lvl=i.getPermissionsGrade();
|
|
|
+ if (lvl==2){
|
|
|
+ //这些角色可以查看全部,反之不能,所以取反
|
|
|
+ if (!((TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.VICE_CEO)||
|
|
|
+ TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
|
|
|
+ TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)))){
|
|
|
+ throw new BusinessException("查询异常");
|
|
|
+ }
|
|
|
}
|
|
|
+ map.put("lvl",lvl);
|
|
|
Pagination<outPaymentList> p=(Pagination<outPaymentList>)findPage("selectPaymentList","selectPaymentCount",
|
|
|
map,i.getPageNo(),i.getPageSize());
|
|
|
return p;
|