修改: 登录提示修改

@@ -2,11 +2,11 @@ package constant
 
 import "os"
 
-var POSTGRESQL_DB_NAME = "partner_dev" //partner
-var POSTGRESQL_USER = "postgres"       //
-var POSTGRESQL_PASSWORD = "eagle1010"  //pgsql@123
-var POSTGRESQL_HOST = "114.55.200.59"  //127.0.0.1
-var POSTGRESQL_PORT = "31543"          //5432
+var POSTGRESQL_DB_NAME = "partner_test" //partner
+var POSTGRESQL_USER = "postgres"        //
+var POSTGRESQL_PASSWORD = "eagle1010"   //pgsql@123
+var POSTGRESQL_HOST = "114.55.200.59"   //127.0.0.1
+var POSTGRESQL_PORT = "31543"           //5432
 var DISABLE_CREATE_TABLE = false
 var DISABLE_SQL_GENERATE_PRINT = false
 

@@ -45,6 +45,9 @@ func errResolve(errPartner, errManager error) (err error) {
 	}
 	if errPartner != nil && errManager != nil {
 		err = errPartner
+		if err == errUserNotFound && errPartner != errUserNotFound {
+			err = errManager
+		}
 		return
 	}
 	return

@@ -31,7 +31,7 @@ func (svr *PgLoginService) Init(phone string) (err error) {
 	)
 	svr.Phone = phone
 	_, svr.PartnerInfo, err = PartnerInfoService.Find(map[string]interface{}{"account": phone, "status": 1, "sortByCreateTime": "ASC"})
-	_, svr.Users, err = UsersRepository.Find(map[string]interface{}{"phone": phone, "status": 1, "sortByCreateTime": "ASC"})
+	_, svr.Users, err = UsersRepository.Find(map[string]interface{}{"phone": phone, "status": 1, "sortByCreateTime": "ASC", "deleteAtIsNull": true})
 	return nil
 }
 
@@ -183,11 +183,6 @@ func (svr *PgLoginService) ManagerStaticInfo() (interface{}, error) {
 					break
 				}
 			}
-			// 删除跳过
-			if user.DeleteAt.Unix() > 0 {
-				log.Debug("【检查权限】", svr.Phone, "【公司】", c.Id, user.Id, 0, "已删除,跳过")
-				continue
-			}
 			if user != nil {
 				if code, e := adminApiGateway.UserAuth(user.Id, constant.BUSINESS_ADMIN_PLATFORM_ID); e != nil || code != 0 {
 					log.Debug("【检查权限】", svr.Phone, "【公司】", c.Id, user.Id, code, e.Error())

@@ -70,6 +70,7 @@ func (repository *UsersRepository) Find(queryOptions map[string]interface{}) (in
 		SetWhere("phone = ?", "phone").
 		SetWhere("company_id = ?", "companyId").
 		SetWhere(`status = ?`, "status").
+		SetWhere(`delete_at is null`, "deleteAtIsNull").
 		SetOrder("create_at", "sortByCreateTime").
 		SetOrder("update_at", "sortByUpdateTime")
 	var err error