瀏覽代碼

支付查看权限修改

anderx 2 年之前
父節點
當前提交
6db6d57644

+ 23 - 6
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -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;
 	}
 
 

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.66
+static.host=//static.jishutao.com/1.2.67
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -49,7 +49,7 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.2.66
+static.host=//static.jishutao.com/1.2.67
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 rd.static.host=//static.jishutao.com/RD/1.0.00