Merge branch 'xggsve-uc' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-uc

xggsve-uc/app/base/service/impl/user/userSve.js

@@ -120,6 +120,7 @@ class UserService extends ServiceBase {
   }
   }
 
 
   async add(obj) {
   async add(obj) {
+    try {
       var roles = obj.roles || [];
       var roles = obj.roles || [];
       var org = obj.org || {};
       var org = obj.org || {};
       var saas_id = Number(obj.saas_id || 0);
       var saas_id = Number(obj.saas_id || 0);
@@ -190,9 +191,13 @@ class UserService extends ServiceBase {
       });
       });
 
 
       return system.getResultSuccess(user);
       return system.getResultSuccess(user);
+    } catch (error) {
+      return system.getResult(-1,`系统错误 错误信息${error}`);
+    }
   }
   }
 
 
   async upd(obj) {
   async upd(obj) {
+    try {
       var id = obj.id;
       var id = obj.id;
       var roles = obj.roles || [];
       var roles = obj.roles || [];
       var org = obj.org || {};
       var org = obj.org || {};
@@ -206,7 +211,7 @@ class UserService extends ServiceBase {
         id: id,
         id: id,
         uctype: uctype,
         uctype: uctype,
         uctypeId: uctypeId,
         uctypeId: uctypeId,
-      org_id: org.id || "",
+        org_id: org.id || null,
         orgpath: "",
         orgpath: "",
         isMain: obj.isMain || 0,
         isMain: obj.isMain || 0,
       }
       }
@@ -237,6 +242,9 @@ class UserService extends ServiceBase {
         return user;
         return user;
       });
       });
       return system.getResultSuccess(user);
       return system.getResultSuccess(user);
+    } catch (error) {
+      return system.getResult(-1,`系统错误 错误信息 ${error}`);
+    }
   }
   }
 
 
   async info(params) {
   async info(params) {