@cpzxrobot/sdk 1.1.52 → 1.1.53

package/dist/user_gateway.js

@@ -117,10 +117,11 @@ class UserGateway extends Object {
             return axios.get(`/api/v2/coremde-sale/user/city/get?area_code=${area_code}`);
         });
     }
-    listByRole(companyId, role) {
-        return this.context.ready.then((axios) => {
-            return axios.get(`/api/v2/company/${companyId}/users?roleCode=${role}`);
-        });
+    async listByRole(role) {
+        var axios = await this.context.ready;
+        var factory = await this.context.user.getSelectedFarm();
+        //当前如果打开的是公司，则说明该应用支持在公司级别打开，则要求该应用应该有对应的公司级别的角色配置，所以并不需要查找公司下属工厂或工厂的对应公司，再去查找用户
+        return axios.get(`/api/v2/company/${factory.id}/users?roleCode=${role}`);
     }
     async mypermission() {
         var axios = await this.context.ready;
@@ -144,17 +145,25 @@ class UserGateway extends Object {
                     });
                 });
             },
-            list: (id, status) => {
+            list: (id, status, pageNo = undefined, pageSize = undefined) => {
                 return this.context.ready.then((axios) => {
                     return axios.post(`/api/v2/coremde-sale/approval/list`, {
                         status,
-                        userId: id
+                        userId: id,
+                        pageNo,
+                        pageSize
                     });
                 });
             },
-            submits: (id) => {
+            submits: (id, pageNo = undefined, pageSize = undefined) => {
                 return this.context.ready.then((axios) => {
-                    return axios.get(`/api/v2/coremde-sale/approval/submit/list?userId=${id}`);
+                    return axios.get(`/api/v2/coremde-sale/approval/submit/list`, {
+                        params: {
+                            userId: id,
+                            pageNo,
+                            pageSize
+                        }
+                    });
                 });
             }
         };
@@ -240,9 +249,13 @@ class UserGateway extends Object {
             },
         };
     }
-    info() {
-        return this.context.ready.then((axios) => {
-            return axios.get(`/api/v1/user/info`);
+    async info() {
+        var axios = await this.context.ready;
+        var factory = await this.context.user.getSelectedFarm();
+        return axios.get(`/api/v1/user/info`, {
+            params: {
+                selected_farm: factory
+            }
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.1.52",
+  "version": "1.1.53",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {

package/user_gateway.ts

@@ -129,10 +129,11 @@ export class UserGateway extends Object {
     });
   }
 
-  listByRole(companyId: number,role: string) {
-    return this.context.ready.then((axios) => {
-      return axios.get(`/api/v2/company/${companyId}/users?roleCode=${role}`);
-    });
+  async listByRole(role: string) {
+    var axios = await this.context.ready;
+    var factory = await this.context.user.getSelectedFarm();
+    //当前如果打开的是公司，则说明该应用支持在公司级别打开，则要求该应用应该有对应的公司级别的角色配置，所以并不需要查找公司下属工厂或工厂的对应公司，再去查找用户
+    return axios.get(`/api/v2/company/${factory.id}/users?roleCode=${role}`);
   }
 
   async mypermission() {
@@ -160,17 +161,25 @@ export class UserGateway extends Object {
           });
         });
       },
-      list: (id: number, status: any) => {
+      list: (id: number, status: any, pageNo: number | undefined = undefined, pageSize: number | undefined = undefined) => {
         return this.context.ready.then((axios) => {
           return axios.post(`/api/v2/coremde-sale/approval/list`, {
             status,
-            userId: id
+            userId: id,
+            pageNo,
+            pageSize
           });
         });
       },
-      submits: (id: number) => {
+      submits: (id: number, pageNo: number | undefined = undefined, pageSize: number | undefined = undefined) => {
         return this.context.ready.then((axios) => {
-          return axios.get(`/api/v2/coremde-sale/approval/submit/list?userId=${id}`);
+          return axios.get(`/api/v2/coremde-sale/approval/submit/list`,{
+            params: {
+              userId: id,
+              pageNo,
+              pageSize
+            }
+          });
         });
       }
     }
@@ -267,9 +276,13 @@ export class UserGateway extends Object {
     }
   }
 
-  info() {
-    return this.context.ready.then((axios) => {
-      return axios.get(`/api/v1/user/info`);
+  async info() {
+    var axios = await this.context.ready;
+    var factory = await this.context.user.getSelectedFarm();
+    return axios.get(`/api/v1/user/info`, {
+      params: {
+        selected_farm: factory
+      }
     });
   }
 }