caipin 4 gadi atpakaļ
vecāks
revīzija
f05662065d

+ 3 - 17
lib/cld.go

@@ -72,23 +72,9 @@ func (c *Cld) LoginValid(loginData viewmodels.StaffCld) (*Result, error) {
 	}
 
 	return &result, nil
-	// fmt.Println("response Body:", string(body))
+}
 
-	// TODO 有接口在调试
-	/*
-		req := HttpRequest.NewRequest()
-		res, _ := req.Post(j.AuthUrl, map[string]interface{}{
-			"code":     loginData.Code,
-			"account":  loginData.Account,
-			"password": loginData.Password,
-			"posttime": "",
-			"token":    "",
-		})
-		_, err := res.Body()
-		if err != nil {
-			return errors.New("账号或密码不正确")
-		}
-	*/
-	//return string(body)
+// 获得cld办事处和员工 列表
+func (c *Cld) GetList(lcategoryId int) {
 
 }

+ 8 - 0
services/backstage_service.go

@@ -25,6 +25,7 @@ type BackstageService interface {
 	ValidCldStaff(loginData viewmodels.StaffCld, writer http.ResponseWriter) (*viewmodels.ResultCld, error)
 	ValidRuleProject(ctx iris.Context) (viewmodels.Project, error)
 	ValidRuleProjectAdd(ctx iris.Context) (viewmodels.Project, error)
+	GetCld(categoryId int)
 	Out(ctx iris.Context) error
 }
 
@@ -148,3 +149,10 @@ func (s *backstageService) Out(ctx iris.Context) error {
 	ctx.RemoveCookie("cmBackstage")
 	return nil
 }
+
+// 获得cld办事处和员工 列表
+func (s *backstageService) GetCld(categoryId int) {
+	cld := lib.NewCld()
+	cld.GetList(categoryId)
+	// result, err := cld.GetList(categoryId)
+}

+ 1 - 1
services/contract_service.go

@@ -284,7 +284,7 @@ func (s *contractService) ValidRuleContractDel(ctx iris.Context) (*viewmodels.Co
 	// 创建一个存放前端传过来参数
 	contractsVaild := &viewmodels.Contracts{}
 	// 存放raw的值,放入到contractsVaild
-	err := ctx.ReadForm(contractsVaild)
+	err := ctx.ReadJSON(contractsVaild)
 	if err != nil {
 		log.Println("folder-ValidRule-ReadForm转换异常, error=", err)
 		return contractsVaild, err

+ 16 - 8
web/backstage/project_bs.go

@@ -12,6 +12,7 @@ import (
 	"github.com/kataras/iris/v12"
 	"go.mod/services"
 	"go.mod/web/utils"
+	"go.mod/web/viewmodels"
 )
 
 type ProjectBs struct {
@@ -118,20 +119,27 @@ func (c *ProjectBs) Get() {
 // @Router /backstage/cld [get]
 func (c *ProjectBs) GetCld() {
 
-	AccountData, err := c.ServiceBackstage.ValidRuleProject(c.Ctx)
+	cldData := viewmodels.StaffCld{}
+	err := c.Ctx.ReadForm(&cldData)
 	if err != nil {
-		ErrMsg := utils.FormValidError(err)
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": ErrMsg})
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
 	}
+
 	// 获得项目ID
-	projectIdInt, err := utils.GetDecryptId(AccountData.Id)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
-		return
+	categoryId := 0
+	if cldData.CategoryId != "" {
+		categoryId, err = utils.GetDecryptId(cldData.CategoryId)
+		if err != nil {
+			c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+			return
+		}
 	}
+
 	// 获得项目信息
-	ProjectData, err := c.ServiceProject.Get(projectIdInt)
+	ProjectData := ""
+	c.ServiceBackstage.GetCld(categoryId)
+	// ProjectData, err := c.ServiceBackstage.GetCld(categoryId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return