gsb

esign-sve-uc/app/base/api/impl/op/action.js

@@ -32,7 +32,6 @@ class ActionAPI extends APIBase {
     async handleRequest(action_process, action_type, action_body) {
         var opResult = null;
         switch (action_type) {
-            // 测试
             // 新增
             case "saveAdminUser":
                 opResult = await this.userSve.saveAdminUser(action_body);
@@ -41,8 +40,20 @@ class ActionAPI extends APIBase {
             case "saveMerchantUser":
                 opResult = await this.userSve.saveMerchantUser(action_body);
                 break;
-            case "login":
-                opResult = await this.userSve.login(action_body);
+            case "adminLogin":
+                opResult = await this.userSve.adminLogin(action_body);
+                break;
+            case "merchantLogin":
+                opResult = await this.userSve.merchantLogin(action_body);
+                break;
+            case "userInfo":
+                opResult = await this.userSve.info(action_body);
+                break;
+            case "userPage":
+                opResult = await this.userSve.pageByCondition(action_body);
+                break;
+            case "userEnabled":
+                opResult = await this.userSve.enabled(action_body);
                 break;
             default:
                 opResult = system.getResult(null, "action_type参数错误");

esign-sve-uc/app/base/service/impl/user/userSve.js

@@ -82,12 +82,21 @@ class UserService extends ServiceBase {
       user.ucname = this.trim(obj.ucname);
       user.mobile = this.trim(obj.mobile);
       user.real_name = this.trim(obj.real_name);
+      user.is_enabled = obj.is_enabled || false;
       if (password) {
         user.password = await this.getEncryptStr(password);
       }
+
+      let exists = await this.dao.findOne({uctype: user.uctype, ucname: user.ucname});
       if (user.id) {
+        if (exists && exists.id != user.id) {
+          return system.getResult(-1, `用户名[${user.ucname}]重复`);
+        }
         user = await user.save();
       } else {
+        if (exists) {
+          return system.getResult(-1, `用户名[${user.ucname}]重复`);
+        }
         user.autoIncrement = true;
         user = await this.dao.create(user);
       }
@@ -102,17 +111,18 @@ class UserService extends ServiceBase {
   }
 
   async info(params) {
-    var id = Number(params.id || 0);
-    var user = await this.dao.getById(id);
+    let id = Number(params.id || 0);
+    let user = await this.dao.getById(id);
     if (!user) {
       return system.getResult(null, "用户不存在");
     }
-    this.handleDate(user, ["created_at"], null, -8);
+    user.password = "";
+    this.handleDate(user, ["created_at", "updated_at"], null);
     return system.getResultSuccess(user);
   }
 
   async enabled(params) {
-    var user = await this.dao.findById(params.id);
+    let user = await this.dao.findById(params.id);
     if (!user) {
       return system.getResult(null, "用户不存在");
     }
@@ -122,12 +132,14 @@ class UserService extends ServiceBase {
   }
 
   async pageByCondition(params) {
-    var result = {
+    let result = {
       count: 0,
       rows: []
     };
-    var currentPage = Number(params.currentPage || 1);
-    var pageSize = Number(params.pageSize || 10);
+    params.currentPage = Number(params.currentPage || 1);
+    params.pageSize = Number(params.pageSize || 10);
+    params.startRow = (params.currentPage - 1) * params.pageSize;
+
     if (params.orgpath) {
       params.orgpath = params.orgpath + "%";
     }
@@ -136,34 +148,17 @@ class UserService extends ServiceBase {
       return result;
     }
     result.count = total;
-    params.startRow = (currentPage - 1) * pageSize;
     result.rows = await this.dao.listByCondition(params) || [];
     if (result.rows) {
       for (let item of result.rows) {
-        this.handleDate(item, ["created_at"], null, -8);
+        this.handleDate(item, ["created_at"], null);
       }
-      await this.setRoles(result.rows);
-      await this.setOrg(result.rows);
     }
     return system.getResultSuccess(result);
   }
 
-  async delUser(params) {
-    var user = await this.findById(params.id);
-    if (!user) {
-      return system.getResultSuccess();
-    }
-    if (user.saas_id != params.saas_id) {
-      return system.getResult(null, "权限不足");
-    }
-    await this.delete({
-      id: params.id
-    });
-    return system.getResultSuccess();
-  }
-
   async updPassword(params) {
-    var user = await this.findById(params.id);
+    let user = await this.findById(params.id);
     if (!user) {
       return system.getResult(null, "用户不存在");
     }
@@ -178,61 +173,6 @@ class UserService extends ServiceBase {
     return system.getResultSuccess(rs);
   }
 
-  async findUsers(params) {
-    if (params.roleCodes && params.roleCodes.length > 0) {
-      var roleIds = await this.roleDao.findIdsByCode(params.roleCodes, params.saas_id);
-      if (!roleIds) {
-        return [];
-      }
-      params.roleIds = roleIds;
-    }
-    let rs = await this.dao.findUsers(params);
-    return system.getResultSuccess(rs);
-  }
-
-  async setOrg(rows) {
-    if (!rows || rows.length == 0) {
-      return;
-    }
-
-    let orgIds = [];
-    for (let row of rows) {
-      orgIds.push(row.org_id);
-    }
-
-    let map = await this.orgDao.mapByIds(orgIds);
-    for (let row of rows) {
-      let org = map[row.org_id] || {};
-      row.orgname = org.orgname || "";
-      row.org = org;
-    }
-  }
-
-  async setRoles(rows) {
-    if (!rows || rows.length == 0) {
-      return;
-    }
-
-    let userIds = [];
-    for (let row of rows) {
-      userIds.push(row.id);
-    }
-
-    let rolesMap = await this.userroleDao.mapByUserIds2(userIds);
-    for (let row of rows) {
-      let roleIds = [];
-      let roleNames = [];
-      let roles = rolesMap[row.id] || [];
-      for (let r of roles) {
-        roleIds.push(r.id);
-        roleNames.push(r.name);
-      }
-      row.roleIds = roleIds.join(",");
-      row.roleNames = roleNames.join(",");
-      row.roles = roles;
-    }
-  }
-
 }
 
 module.exports = UserService;
\ No newline at end of file

esign-sve-uc/app/config/localsettings.js

@@ -14,7 +14,6 @@ var settings={
       // port: 3306,
       host: '43.247.184.35',
       port: 8899,
-
       dialect: 'mysql',
         operatorsAliases: false,
         pool: {