Browse Source

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

anderx 3 years ago
parent
commit
8b3e886ba0

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -656,7 +656,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			}
 		}
 		if (StringUtils.isNotBlank(salesmanName)) parameter.put("salesmanName", salesmanName);
-		if(processState==5&&TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
+		//财务专员有财务经理查看财务专员的权限
+		if(processState==OrderChangeProcess.CWZY.getCode()&&TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)) {
 			parameter.put("aids", adminMapper.selectBySuperId(TokenManager.getAdminId()));
 		}else {
 			parameter.put("aid", TokenManager.getAdminId());

+ 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.60
+static.host=//static.jishutao.com/1.2.61
 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.14

+ 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.60
+static.host=//static.jishutao.com/1.2.61
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 rd.static.host=//static.jishutao.com/RD/1.0.00

+ 1 - 0
src/main/resources/spring/spring-shiro.xml

@@ -63,6 +63,7 @@
 	<bean id="shrioRedisCacheManager"
 		class="com.goafanti.core.shiro.cache.ShiroRedisCacheManager">
 		<property name="redisTemplate" ref="sessionRedisTemplate" />
+<!--	token有效时间-->
 		<property name="expire" value="7200" />
 	</bean>