gsb

xgg-admin/app/base/controller/impl/uc/userCtl.js

@@ -16,17 +16,17 @@ class UserCtl extends CtlBase {
   async login(pobj, pobj2, req, res) {
     var loginName = this.trim(pobj.loginName);
     var password = this.trim(pobj.password);
-    var captchaKey = this.trim(pobj.captchaKey);
-    var captchaCode = this.trim(pobj.captchaCode);
+    // var captchaKey = this.trim(pobj.captchaKey);
+    // var captchaCode = this.trim(pobj.captchaCode);
 
     try {
-      var vrs = await this.captchaSve.valid({
-        key: captchaKey,
-        code: captchaCode,
-      });
-      if (vrs.status !== 0) {
-        // return vrs;
-      }
+      // var vrs = await this.captchaSve.valid({
+      //   key: captchaKey,
+      //   code: captchaCode,
+      // });
+      // if (vrs.status !== 0) {
+      //   return vrs;
+      // }
 
       var loginUser = await this.userSve.login({
         ucname: loginName,
@@ -69,6 +69,7 @@ class UserCtl extends CtlBase {
         ucname: this.trim(params.ucname),
         password: this.trim(params.password),
         uctype: Number(params.uctype || 1),
+        uctypeId: this.trim(params.uctypeId),
         mobile: this.trim(params.mobile),
         realName: this.trim(params.realName),
         roles: params.roles || [],
@@ -109,6 +110,7 @@ class UserCtl extends CtlBase {
       saas_id: params.saas_id,
       org_id: Number(params.org_id || 0),
       uctype: Number(params.uctype || 1),
+      uctypeId: this.trim(params.uctypeId),
       mobile: this.trim(params.mobile),
       realName: this.trim(params.realName),
       roles: params.roles || [],

xgg-admin/app/front/entry/public/apidoc/uc/user.md

@@ -275,23 +275,7 @@
   {
     "status": 0,
     "msg": "success",
-    "data": {
-        "count": 8,
-        "rows": [
-            {
-              "id": 17,                             // id
-              "ucname": "guodegang10",              // 登录名
-              "uctype": 2,                          // 用户类型 1平台 2商户 3交付商 4个人
-              "uctypeId": "",                       // 用户类型id
-              "org_id": 3,                          // 组织机构id
-              "isMain": 0,                          // 是否主管
-              "isEnabled": 1,                       // 启用/禁用   0禁用 1启用
-              "created_at": "2019-11-29 10:43:32",  // 创建时间
-              "mobile": "1381231332312",            // 手机号
-              "realName": "郭德纲11",                // 姓名
-            },
-        ]
-    },
+    "data": {},
     "requestid": "defbe7aa7b1045c4b644e1c9eb58fd88"
 }