Merge remote-tracking branch 'remotes/origin/20180328_sale' into 9637230e

src/main/java/tkio/service/impl/TkioAccountServiceImpl.java

@@ -89,7 +89,12 @@ public class TkioAccountServiceImpl implements TkioAccountService {
             User user1 = userRepository.findByEmail(one.getEmail());
             map.put("old", user1.getName());
         }
-        List<User> list = userService.findbyRole(user.getRole());
+        List<User> list = new ArrayList<>();
+        if(user.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey()) || user.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey())){
+            list = userService.findbyRole(user.getRole());
+        }else {
+           list = userRepository.findSales();
+        }
         map.put("new", list);
         return map;
     }

src/main/resources/spring/applicationContext-schedule.xml

@@ -12,7 +12,7 @@
     <bean id="tkioAccountTask" class="tkio.task.AccountTask"></bean>
    <task:scheduled-tasks>
         <!--//定时同步短链数据(每5分钟执行一次)-->
-        <task:scheduled ref="tkioAccountTask" method="task" cron="0 45 10 * * ?"/>
+        <task:scheduled ref="tkioAccountTask" method="task" cron="0 1 11 * * ?"/>
     </task:scheduled-tasks>
 
     <bean id="tkioNoticeTask" class="tkio.task.NoticeTask"></bean>