合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!21

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java

@@ -195,8 +195,8 @@ public class SyncDataServiceImpl implements ISyncDataService{
                     ppEmployeeList.addAll(currentPPEmployeeList);
                 }
             }
-            // 处理同步过来的数据id不同，username相同的情况
+            // 处理同步过来的数据id不同，username相同的情况 creation_time不能为空
-            ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed());
+//            ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed());
 
             //此处获取全部pp用户信息
             List<SysUser> sysUserList = sysUserService.getPPEmployeeList();

jero-web/src/components/tools/UserMenu.vue

@@ -223,13 +223,13 @@
             return that.Logout({}).then(() => {
               // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
               //  TODO  在部署线上时注掉以下代码
-              that.$router.push({ path: '/user/login' })
+              // that.$router.push({ path: '/user/login' })
 
               // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' +
               // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地
               //  TODO  在部署线上时解开以下代码
-              // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
+              window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
-              // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
+              encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上
 
               localStorage.removeItem('language')
               // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面

jero-web/src/permission.js

@@ -14,10 +14,10 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration
 // TODO   线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码
 
 //  TODO  在部署线上时注掉以下代码
-const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration']
+// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration']
 
 //  TODO  在部署线上时解开一下代码
-// const whiteList = []
+const whiteList = []
 
 
 // no redirect whitelist
@@ -96,7 +96,7 @@ router.beforeEach((to, from, next) => {
             // query: { redirect: to.fullPath }
             store.dispatch('Logout').then(() => {
               //  TODO  在部署线上时注掉此代码
-              next({ path: '/user/login', query: { redirect: to.fullPath } })
+              // next({ path: '/user/login', query: { redirect: to.fullPath } })
 
               let fullPath = ''
               if (to.fullPath == '/') {
@@ -109,8 +109,8 @@ router.beforeEach((to, from, next) => {
               //   + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
 
               //  TODO  在部署线上时解开此代码
-              // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
+              window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
-              //   + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
+                + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
             })
           })
       } else {
@@ -123,7 +123,7 @@ router.beforeEach((to, from, next) => {
       next()
     } else {
       //  TODO  在部署线上时注掉此代码
-      next({ path: '/user/login', query: { redirect: to.fullPath } })
+      // next({ path: '/user/login', query: { redirect: to.fullPath } })
 
       let fullPath = ''
       if (to.fullPath == '/') {
@@ -135,8 +135,8 @@ router.beforeEach((to, from, next) => {
       // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
       //   + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
       //  TODO  在部署线上时解开此代码
-      // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
+      window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri='
-      //   + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
+        + encodeURIComponent('https://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上
 
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }