Bom功 bug修改

models/me/BomLst.model.go

@@ -88,12 +88,12 @@ func (t *BomLst) GetPage() (Menus []BomLst, err error) {
 }
 
 //递归查询侧边栏
-func (t *BomLst) SetMenu() (m []BomLst, err error) {
+func (t *BomLst) SetMenu(FmatNr string) (m []BomLst, err error) {
 	menulist, err := t.GetPage()
 	m = make([]BomLst, 0)
 	for i := 0; i < len(menulist); i++ {
 		//menulist[i].Clipped()
-		if menulist[i].FmatNr != t.BomId {
+		if menulist[i].FmatNr != FmatNr {
 			continue
 		}
 		menusInfo := DiguiMeBomlst(&menulist, menulist[i])

services/me/implments/BomHead.service.impl.go

@@ -98,16 +98,22 @@ func (impl *BomHeadServiceImplement) InsertOne(user *models.Usertab, entity *mod
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewBomHeadDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(entity.BomId)
 	if err != nil {
+		_ = session.Rollback()
 		return err
 	}
 	if record != nil {
+		_ = session.Rollback()
 		return grmi.NewBusinessError("已经存在相同主键的记录!")
 	}
 	err = dao.InsertOne(entity)
 	if err != nil {
+		_ = session.Rollback()
 		return err
 	}
 
@@ -141,6 +147,9 @@ func (impl *BomHeadServiceImplement) DeleteOne(user *models.Usertab, bomId strin
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewBomHeadDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(bomId)
 	if err != nil {
@@ -151,14 +160,17 @@ func (impl *BomHeadServiceImplement) DeleteOne(user *models.Usertab, bomId strin
 	}
 	err = dao.DeleteOne(bomId)
 	if err != nil {
+		_ = session.Rollback()
 		return err
 	}
 
 	dao2 := dal.NewBomLstDAO(session, user.Pid, user.Userid)
 	err = dao2.DeleteWhere([]grmi.Predicate{meta.BomLst_BomId.NewPredicate(grmi.Equal, bomId)})
 	if err != nil {
+		_ = session.Rollback()
 		return err
 	}
+	session.Commit()
 	return nil
 }
 
@@ -183,8 +195,8 @@ func (impl *BomHeadServiceImplement) SelectOne(user *models.Usertab, bomId strin
 	if result != nil{
 		var Me model.BomLst
 		Me.PlantNr = result.PlantNr
-		Me.BomId = bomId
-		bomList, err := Me.SetMenu()
+		Me.BomId = result.BomId
+		bomList, err := Me.SetMenu(result.MatNr)
 		if err != nil {
 			return nil, err
 		}

services/me/implments/BomLst.service.impl.go

@@ -113,12 +113,16 @@ func (impl *BomLstServiceImplement) InsertOne(user *models.Usertab, entity *mode
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
+	if err := session.Begin(); err != nil {
+		return err
+	}
 	dao := dal.NewBomLstDAO(session, user.Pid, user.Userid)
 	record, err := dao.SelectOne(entity.BomId, entity.FmatNr, entity.CmatNr)
 	if err != nil {
 		return err
 	}
 	if record != nil {
+		_ = session.Rollback()
 		return grmi.NewBusinessError("已经存在相同主键的记录!")
 	}
 	err = dao.InsertOne(entity)