Просмотр исходного кода

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

anderx лет назад: 4
Родитель
Сommit
02924e8b82
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

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

@@ -284,7 +284,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public List<TOrderTaskBo> selectOrderTask(String orderNo) {
 	public List<TOrderTaskBo> selectOrderTask(String orderNo) {
 		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
 		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
 			for (TOrderTaskBo t : list) {
 			for (TOrderTaskBo t : list) {
-				if (TokenManager.hasRole(AFTConstants.SALESMAN)&&TokenManager.hasRole(AFTConstants.SALESMAN)) {
+				if (TokenManager.hasRole(AFTConstants.SALESMAN)&&TokenManager.hasRole(AFTConstants.TECH)) {
 					//如果是双角色不做处理。
 					//如果是双角色不做处理。
 				} else if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
 				} else if (TokenManager.hasRole(AFTConstants.SALESMAN)) {
 				t.setOutsourceName("****");
 				t.setOutsourceName("****");