修改CLD登录判断

modules/users/models/manager_model.js

@@ -131,25 +131,6 @@ class ManagerModel extends BaseModel {
     async validLogin(username, password) {
         let managerData = await this.findDataByCondition({username: username});
 
-        // 如果不是超级管理员登录则走CLD接口登录流程
-        if (username !== this.adminUsername) {
-            let CLDLoginInfo = await this.CLDLogin(username, password, managerData);
-            managerData = CLDLoginInfo;
-        } else {
-            this.valid(password, managerData);
-        }
-
-        return managerData;
-    }
-
-    /**
-     * 验证登录信息
-     *
-     * @param {String} password
-     * @param {Object} managerData
-     * @return {void}
-     */
-    valid(password, managerData) {
         // 没有找到对应数据
         if (managerData === null || managerData._id === undefined) {
             throw {code: 44001, err: '用户名或密码错误'};
@@ -160,13 +141,22 @@ class ManagerModel extends BaseModel {
             throw {code: 44002, err: '用户名不存在'};
         }
 
-        // 加密密码
-        let encryptPassword = this.encryptPassword(managerData.token, password);
-        if (encryptPassword !== managerData.password) {
-            throw {code: 44001, err: '用户名或密码错误'};
+        // 如果不是超级管理员登录则走CLD接口登录流程
+        if (username !== this.adminUsername) {
+            let CLDLoginInfo = await this.CLDLogin(username, password, managerData);
+            managerData = CLDLoginInfo;
+        } else {
+            // 加密密码
+            let encryptPassword = this.encryptPassword(managerData.token, password);
+            if (encryptPassword !== managerData.password) {
+                throw {code: 44001, err: '用户名或密码错误'};
+            }
         }
+
+        return managerData;
     }
 
+
     /**
      * CLD登录
      *
@@ -180,10 +170,6 @@ class ManagerModel extends BaseModel {
         if (username === '' || password === '') {
             throw {code: 44001, err: '用户名或密码错误'};
         }
-        // 库中不存在则不允许登录，需等同步到数据后才可以继续后面的流程
-        if (!managerData) {
-            throw {code: 44003, err: '用户不存在'};
-        }
 
         let CLDUrl = 'http://cld.smartcost.com.cn/api/auth';
         // 生成加密token

web/users/js/manager.js

@@ -11,7 +11,7 @@ $(document).ready(function() {
     $(".edit").click(function() {
         // 获取当前点击的数据
         let canLogin = $(this).data('login');
-        if (canLogin) {
+        if (!canLogin) {
             $("input[name='can_login']").attr('checked', 'checked');
         } else {
             $("input[name='can_login']").removeAttr('checked');
@@ -57,7 +57,7 @@ $(document).ready(function() {
         $.ajax({
             url: '/manager/modify/' + selectId,
             type: 'post',
-            data: {permission: permission, login: login ? 1 : 0},
+            data: {permission: permission, login: login ? 0 : 1},
             dataType: 'json',
             error: function() {
                 isSaving = false;