feat：完善项目

app/api/admin/controller/technology/achievement.go

@@ -0,0 +1,105 @@
+package technology
+
+import (
+	"SciencesServer/app/api/admin/model"
+	"SciencesServer/app/basic/controller"
+	model2 "SciencesServer/app/common/model"
+	"SciencesServer/app/session"
+	"errors"
+)
+
+type Achievement struct {
+	*session.Admin
+}
+
+type AchievementHandle func(session *session.Admin) *Achievement
+
+type (
+	// AchievementInfo 成果信息
+	AchievementInfo struct {
+		ID string `json:"id"`
+		*model.TechnologyAchievementInfo
+		Area string `json:"area"`
+	}
+	// AchievementDetailInfo 成果详细信息
+	AchievementDetailInfo struct {
+		ID       string `json:"id"`
+		TenantID string `json:"tenant_id"`
+		*model2.TechnologyAchievement
+	}
+)
+
+// Instance 首页信息
+func (c *Achievement) Instance(tenantID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) {
+	mTechnologyAchievement := model.NewTechnologyAchievement()
+
+	where := make([]*model2.ModelWhere, 0)
+
+	if c.TenantID > 0 {
+		where = append(where, model2.NewWhere("p.tenant_id", c.TenantID))
+	}
+	if tenantID > 0 {
+		where = append(where, model2.NewWhere("p.tenant_id", tenantID))
+	}
+	if title != "" {
+		where = append(where, model2.NewWhereLike("p.title", title))
+	}
+	var count int64
+
+	out, err := mTechnologyAchievement.Achievement(page, pageSize, &count, where...)
+
+	if err != nil {
+		return nil, err
+	}
+	list := make([]*AchievementInfo, 0)
+
+	for _, v := range out {
+		list = append(list, &AchievementInfo{
+			ID:                        v.GetEncodeID(),
+			TechnologyAchievementInfo: v,
+			Area:                      v.FormatBasic(),
+		})
+	}
+	return &controller.ReturnPages{Data: list, Count: count}, nil
+}
+
+// Detail 详细信息
+func (c *Achievement) Detail(id uint64) (*AchievementDetailInfo, error) {
+	mTechnologyAchievement := model.NewTechnologyAchievement()
+	mTechnologyAchievement.ID = id
+
+	isExist, err := model2.First(mTechnologyAchievement.TechnologyAchievement)
+
+	if err != nil {
+		return nil, err
+	} else if !isExist {
+		return nil, errors.New("操作错误，成果信息不存在或已被删除")
+	}
+	return &AchievementDetailInfo{
+		ID:                    mTechnologyAchievement.GetEncodeID(),
+		TenantID:              mTechnologyAchievement.GetEncodeTenantID(),
+		TechnologyAchievement: mTechnologyAchievement.TechnologyAchievement,
+	}, nil
+}
+
+func (c *Achievement) Delete(id uint64) error {
+	mTechnologyAchievement := model.NewTechnologyAchievement()
+	mTechnologyAchievement.ID = id
+
+	isExist, err := model2.First(mTechnologyAchievement.TechnologyAchievement)
+
+	if err != nil {
+		return err
+	} else if !isExist {
+		return errors.New("操作错误，成果信息不存在或已被删除")
+	} else if c.TenantID > 0 && mTechnologyAchievement.TenantID != c.TenantID {
+		return errors.New("操作错误，无权限操作")
+	}
+	return nil
+}
+
+func NewAchievement() AchievementHandle {
+	return func(session *session.Admin) *Achievement {
+		return &Achievement{session}
+	}
+}

app/api/admin/controller/technology/patent.go

@@ -241,6 +241,8 @@ func (c *Patent) Delete(id uint64) error {
 		return err
 	} else if !isExist {
 		return errors.New("操作错误，专利信息不存在或已被删除")
+	} else if c.TenantID > 0 && mSysPatent.TenantID != c.TenantID {
+		return errors.New("操作错误，无权限操作")
 	}
 	return model2.Delete(mSysPatent.SysPatent)
 }

app/api/admin/controller/technology/product.go

@@ -17,7 +17,8 @@ type ProductHandle func(session *session.Admin) *Product
 type (
 	// ProductInfo 产品信息
 	ProductInfo struct {
-		ID string `json:"id"`
+		ID   string `json:"id"`
+		Area string `json:"area"`
 	}
 	// ProductDetailInfo 产品详细信息
 	ProductDetailInfo struct {
@@ -51,7 +52,10 @@ func (c *Product) Instance(tenantID uint64, title string, page, pageSize int) (*
 	list := make([]*ProductInfo, 0)
 
 	for _, v := range out {
-		list = append(list, &ProductInfo{ID: v.GetEncodeID()})
+		list = append(list, &ProductInfo{
+			ID:   v.GetEncodeID(),
+			Area: v.FormatBasic(),
+		})
 	}
 	return &controller.ReturnPages{Data: list, Count: count}, err
 }
@@ -90,6 +94,8 @@ func (c *Product) Delete(id uint64) error {
 		return err
 	} else if !isExist {
 		return errors.New("操作错误，产品信息不存在或已被删除")
+	} else if c.TenantID > 0 && mTechnologyProduct.TenantID != c.TenantID {
+		return errors.New("操作错误，无权限操作")
 	}
 	return model2.Delete(mTechnologyProduct.TechnologyProduct)
 }