fix(主从用户): 主从用户删除逻辑完善

service/system/system.go

@@ -118,8 +118,7 @@ func (s Service) GetUserList(req *user.UserInfoReq, userId int32) (userInfos use
 func (s Service) AddMainUserOrUser(req *user.AddMainOrSubReq, userInfo request.UserInfo) error {
 	for _, v := range req.Ids {
 		if req.ReqType == 1 { // 新增主用户
-			s.Dao.DB.Model("master_user").
-				Insert(g.Map{"UserId": v})
+			s.Dao.DB.Model("master_user").Insert(g.Map{"UserId": v})
 		} else if req.ReqType == 2 { // 添加主从用户关系
 			// 添加主从用户关系表
 			saveEntity := user.BaseUserRelation{
@@ -145,17 +144,26 @@ func (s Service) DeleteMainUserOrSubUser(req *user.AddMainOrSubReq, info request
 		if count > 0 {
 			return errors.New("该用户有从用户,无法删除！")
 		}
-		s.Dao.DB.Model("master_user").Delete("UserId = ?", req.Id)
+		_, err = s.Dao.DB.Model("master_user").Delete("UserId = ?", req.Id)
+		if err != nil {
+			return err
+		}
+		_, err = s.Dao.DB.Model("base_user_relation").Delete("Pid = ?", req.Id)
+		return err
 	} else if req.ReqType == 2 { // 删除从用户 先判断是否有未结账
-		count, err := s.Dao.DB.Model("settle_account_main").
-			Where("AppointUserId = " + strconv.Itoa(req.Id) + " and SettleStatus = 1").Count()
+		count, err := s.Dao.DB.Model("settle_account_main").Where("AppointUserId = " + strconv.Itoa(req.Id) + " and SettleStatus = 1").Count()
 		if err != nil {
 			return err
 		}
 		if count > 0 {
 			return errors.New("该用户有未结账明细,无法删除！")
 		}
-		s.Dao.DB.Model("base_user_relation").Delete("UserId = ?", req.Id)
+		_, err = s.Dao.DB.Model("base_user_relation").Delete("UserId = ?", req.Id)
+		if err != nil {
+			return err
+		}
+		_, err = s.Dao.DB.Model("base_user_relation").Delete("UserId = ?", req.Id)
+		return err
 	}
 	return nil
 }