Преглед на файлове

Merge branch 'test' of jishutao/kede-server into prod

anderx преди 3 години
родител
ревизия
8dd2e43969
променени са 2 файла, в които са добавени 5 реда и са изтрити 4 реда
  1. 4 3
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  2. 1 1
      src/main/resources/props/config_local.properties

+ 4 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -284,14 +284,15 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public List<TOrderTaskBo> selectOrderTask(String orderNo) {
 		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
 			for (TOrderTaskBo t : list) {
-				if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
+				if (TokenManager.hasRole(AFTConstants.SALESMAN)&&TokenManager.hasRole(AFTConstants.SALESMAN)) {
+					//如果是双角色不做处理。
+				} else if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
 				t.setOutsourceName("****");
 				t.setOutsourcePrice(new BigDecimal(0));
 				t.setDeclareUser("****");
 				t.setDeclarePwd("****");
 				t.setCertificateNumber("****");
-				}
-				if (TokenManager.hasRole(AFTConstants.TECH)) {
+				}else if (TokenManager.hasRole(AFTConstants.TECH)) {
 					//设置隐藏金额
 					t.setCommodityPrice(new BigDecimal(-1));
 					}

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

@@ -50,7 +50,7 @@ user_channel_days=90
 #avatar.host=//172.16.0.253
 
 #avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.09
+static.host=//static.jishutao.com/1.2.10
 avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.05
 #static.host=http://172.16.1.187/prod/1.2.05