Browse Source

财务列表角色权限判断更换

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
faac4c5880

+ 10 - 5
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -158,15 +158,20 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		Map<String, Object> result = new HashMap<String, Object>();
 		Map<String, Object> params = new HashMap<String, Object>();
 		List<String> fids=new ArrayList<>();
-		if(TokenManager.hasRole(AFTConstants.FINANCE)) {
-			 fids.add(TokenManager.getAdminId());
-			params.put("fids",fids);
-		}
-		if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+		
+		if(TokenManager.hasRole(AFTConstants.CED)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||
+				TokenManager.hasRole(AFTConstants.VICE_CEO)||TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||
+				TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
+			//如果是这些角色则看全部
+		}else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
 			fids =adminMapper.selectBySuperId(TokenManager.getAdminId());
 			params.put("fids", fids);
+		} else {
+			 fids.add(TokenManager.getAdminId());
+			params.put("fids",fids);
 		}
 		
+		
 		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.28
-avatar.host=//sb.jishutao.com
+#static.host=//sb.jishutao.com/1.1.28
+#avatar.host=//sb.jishutao.com
 
 #连测试
-#avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.28
+avatar.host=//static.jishutao.com
+static.host=//static.jishutao.com/1.1.28
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload