gsb

xggsve-uc/app/base/db/impl/user/userDao.js

@@ -170,9 +170,8 @@ class UserDao extends Dao {
     sql.push("SELECT");
     sql.push("t1.id, t1.ucid, t1.ucname, t1.uctype, t1.org_id, t1.orgpath,");
     sql.push("t1.isMain, t1.saas_id, t1.isEnabled, t1.created_at,");
-    sql.push("t2.mobile, t2.realName");
+    sql.push("t1.mobile, t1.realName");
     sql.push("FROM uc_user t1");
-    sql.push("INNER JOIN uc_user_info t2 ON t1.id = t2.id");
     sql.push("LEFT JOIN uc_user_role t3 ON t1.id = t3.user_id");
     sql.push("WHERE 1 = 1 ");
 

xggsve-uc/app/base/service/impl/org/orgSve.js

@@ -130,23 +130,6 @@ class OrgService extends ServiceBase {
         return system.getResult(-1, `参数错误 组织名称不能为空`)
       }
 
-      let exists = await this.findOne({
-        orgname: params.orgname,
-        saas_id: params.saas_id
-      });
-
-      if (id) {
-        if (exists && id != exists.id) {
-          return system.getResult(-1, `参数错误 ${params.orgname} 组织名称已经存在`);
-        }
-      } else {
-        if (exists) {
-          return system.getResult(-1, `参数错误 ${params.orgname} 组织名称已经存在`);
-        }
-      }
-
-      let mainUser;
-
       let path = "";
       if (pid === 0) {
         if(!id) {