caipin 4 yıl önce
ebeveyn
işleme
06e5d33aa8

+ 3 - 2
dao/project_account_dao.go

@@ -81,11 +81,12 @@ func (d *ProjectAccountDao) GetAll(projectId int) []models.CmProjectAccount {
 	}
 }
 
-func (d *ProjectAccountDao) GetInId(ids string) []models.CmProjectAccount {
+func (d *ProjectAccountDao) GetInId(ids string, name string) []models.CmProjectAccount {
 
 	datalist := make([]models.CmProjectAccount, 0)
 	err := d.engine.
-		Where("id in ( " + ids + " ) ").
+		Where("id in ( "+ids+" ) ").
+		And("account like ? or name like ? or company like ? or mobile like ?", name+"%", name+"%", name+"%", name+"%").
 		Desc("id").
 		Find(&datalist)
 	if err != nil {

+ 4 - 4
lib/permission.json

@@ -39,26 +39,26 @@
     },
     "safe": {
         "add": [
-            "/api/safe"
+            
         ],
         "access": [
             "/api/safe/detail",
             "/api/safe"
         ],
         "delete": [
-            "/api/safe"
+            
         ]
     },
     "quality": {
         "add": [
-            "/api/quality"
+            
         ],
         "access": [
             "/api/quality/detail",
             "/api/quality"
         ],
         "delete": [
-            "/api/quality"
+            
         ]
     },
     "projectSetting": []

+ 3 - 3
services/project_account_service.go

@@ -34,7 +34,7 @@ type ProjectAccountService interface {
 	ValidGetPermission(ctx iris.Context) (viewmodels.Permission, error)
 	Get(accountId int, projectId int) *viewmodels.ProjectAccount
 	GetAll(projectId int) []viewmodels.ProjectAccount
-	GetBidAccount(bidsectionId int, projectId int, projectAccountId int) []viewmodels.ProjectAccount
+	GetBidAccount(bidsectionId int, projectId int, projectAccountId int, name string) []viewmodels.ProjectAccount
 	Search(name string, projectId int) []viewmodels.ProjectAccount
 	Add(viewAccount viewmodels.ProjectAccount, projectId int) error
 	Save(viewAccount viewmodels.ProjectAccount, id int, projectId int) error
@@ -220,7 +220,7 @@ func (s *projectAccountService) GetAll(projectId int) []viewmodels.ProjectAccoun
 }
 
 // 获得标段下的账号
-func (s *projectAccountService) GetBidAccount(bidsectionId int, projectId int, projectAccountId int) []viewmodels.ProjectAccount {
+func (s *projectAccountService) GetBidAccount(bidsectionId int, projectId int, projectAccountId int, name string) []viewmodels.ProjectAccount {
 	// 1.获得标段账号ID
 	bidAccountData := s.bidAccountDao.GetBidAccount(bidsectionId, projectId)
 
@@ -234,7 +234,7 @@ func (s *projectAccountService) GetBidAccount(bidsectionId int, projectId int, p
 	inId := strings.Join(idList, ",")
 
 	// 获得账号信息
-	accountData := s.dao.GetInId(inId)
+	accountData := s.dao.GetInId(inId, name)
 
 	// 2.获得账号权限
 	permissionData := s.permissionAccountDao.GetBidsectionId(bidsectionId)

+ 1 - 1
web/api/project_account_api.go

@@ -126,7 +126,7 @@ func (c *ProjectAccountApi) GetGroup() {
 // @Security ApiKeyAuth
 // @Param   name     body    string     true        "检索内容"
 // @Success 200 {object} viewmodels.ProjectAccount "{code:0成功,-1参数类错误,data:viewmodels.ProjectAccount,msg:错误信息}"
-// @Router /api/projectAccount/searchc [get]
+// @Router /api/projectAccount/search [get]
 func (c *ProjectAccountApi) GetSearch() {
 	// 获得项目ID
 	projectIdInt, err := utils.GetProjectId(c.Ctx)

+ 3 - 2
web/api/project_setting_auth_api.go

@@ -22,12 +22,13 @@ import (
 // @Produce  json
 // @Security ApiKeyAuth
 // @Param   bidsectionId     path    string     false        "标段ID"
+// @Param   name     path    string     false        "账号名称"
 // @Success 200 {object} viewmodels.ProjectAccount "{code:0成功,-1参数类错误,data:viewmodels.ProjectAccount,msg:错误信息}"
 // @Router /api/projectSetting/bid/account [get]
 func (c *ProjectSettingApi) GetBidAccount() {
 
 	// 获得标段ID
-	TreeData := viewmodels.Tree{}
+	TreeData := viewmodels.ProjectAccount{}
 	err := c.Ctx.ReadForm(&TreeData)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": err})
@@ -58,7 +59,7 @@ func (c *ProjectSettingApi) GetBidAccount() {
 		return
 	}
 
-	dataList := c.ServiceProjectAccount.GetBidAccount(bidsectionId, projectIdInt, projectAccountIdInt)
+	dataList := c.ServiceProjectAccount.GetBidAccount(bidsectionId, projectIdInt, projectAccountIdInt, TreeData.Name)
 
 	c.Ctx.JSON(iris.Map{
 		"code": 0,

+ 1 - 0
web/viewmodels/project_account.go

@@ -15,6 +15,7 @@ import (
 type ProjectAccount struct {
 	Id                 string `form:"id" json:"id"`
 	ProjectId          string `form:"projectId" json:"projectId"`
+	BidsectionId       string `form:"bidsectionId" json:"bidsectionId"`
 	Account            string `form:"account" json:"account"`
 	Password           string `form:"password" json:"password"`
 	Name               string `form:"name" json:"name"`