1

lib/cld.go

@@ -78,12 +78,12 @@ func (c *Cld) LoginValid(loginData viewmodels.StaffCld) (*Result, error) {
 }
 
 // 获得cld办事处和员工 列表
-func (c *Cld) GetList(categoryId int) (map[string]interface{}, error) {
+func (c *Cld) GetList(categoryId string) (map[string]interface{}, error) {
 
 	data := url.Values{}
 	parameter := strings.NewReader(data.Encode())
 
-	url := fmt.Sprintf("%s?categoryId=%d", c.CategoryUrl, categoryId)
+	url := fmt.Sprintf("%s?categoryId=%s", c.CategoryUrl, categoryId)
 
 	return c.cldRequest("GET", url, parameter)
 }

models/cm_project.go

@@ -10,9 +10,9 @@ type CmProject struct {
 	EnterpriseId int       `xorm:"comment('企业id') INT(11)"`
 	UserId       int       `xorm:"comment('管理员id(sso用户)') INT(11)"`
 	UserAccount  string    `xorm:"comment('管理员名字(sso用户名)') VARCHAR(32)"`
-	CategoryId   int       `xorm:"comment('办事处ID') INT(11)"`
+	CategoryId   string    `xorm:"comment('办事处ID') VARCHAR(64)"`
 	Category     string    `xorm:"comment('办事处') VARCHAR(32)"`
-	StaffId      int       `xorm:"comment('负责人Id(cld员工)') INT(11)"`
+	StaffId      string    `xorm:"comment('负责人Id(cld员工)') VARCHAR(64)"`
 	StaffName    string    `xorm:"comment('负责人(cld员工)') VARCHAR(32)"`
 	CreateTime   time.Time `xorm:"comment('创建时间') DATETIME"`
 	MaxUser      int       `xorm:"comment('最大创建用户数(删除)') TINYINT(4)"`

services/backstage_service.go

@@ -25,7 +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)
-	GetCldByCategoryId(categoryId int) (map[string]interface{}, error)
+	GetCldByCategoryId(categoryId string) (map[string]interface{}, error)
 	Out(ctx iris.Context) error
 }
 
@@ -151,7 +151,7 @@ func (s *backstageService) Out(ctx iris.Context) error {
 }
 
 // 获得cld办事处和员工 列表
-func (s *backstageService) GetCldByCategoryId(categoryId int) (map[string]interface{}, error) {
+func (s *backstageService) GetCldByCategoryId(categoryId string) (map[string]interface{}, error) {
 	cld := lib.NewCld()
 
 	result, err := cld.GetList(categoryId)

services/project_service.go

@@ -32,7 +32,7 @@ type ProjectService interface {
 	GetList(page int, size int) []viewmodels.Project
 	GetName(code string) []viewmodels.Project
 	Save(projectId int, projectVM viewmodels.Project) error
-	Add(projectVM viewmodels.Project, categoryId int, staffId int) error
+	Add(projectVM viewmodels.Project, categoryId string, staffId string) error
 }
 
 //返回service操作类
@@ -152,7 +152,7 @@ func (s *projectService) Save(id int, projectVM viewmodels.Project) error {
 }
 
 // 新增项目
-func (s *projectService) Add(projectVM viewmodels.Project, categoryId int, staffId int) error {
+func (s *projectService) Add(projectVM viewmodels.Project, categoryId string, staffId string) error {
 	project := &models.CmProject{}
 	project.Name = projectVM.Name
 	project.Code = projectVM.Code

web/backstage/project_bs.go

@@ -113,7 +113,7 @@ func (c *ProjectBs) Get() {
 // @Tags 后台 - 项目
 // @Accept  json
 // @Produce  json
-// @Param   categoryId     body    int     true        "办事处ID"
+// @Param   categoryId     body    string     true        "办事处ID"
 // @Success 200 {object} viewmodels.ProjectAccount "{code:0成功,data:viewmodels.ProjectAccount,msg:}"
 // @Failure 400 {string} string	"{code:-1参数类错误,msg:错误信息}"
 // @Router /backstage/project/cld [get]
@@ -127,18 +127,18 @@ func (c *ProjectBs) GetCld() {
 	}
 
 	// 获得项目ID
-	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
-		}
-	}
+	// 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
+	// 	}
+	// }
 
 	// 获得项目信息
 	// c.ServiceBackstage.GetCldByCategoryId(categoryId)
-	data, err := c.ServiceBackstage.GetCldByCategoryId(categoryId)
+	data, err := c.ServiceBackstage.GetCldByCategoryId(cldData.CategoryId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return
@@ -173,19 +173,19 @@ func (c *ProjectBs) PostAdd() {
 		return
 	}
 
-	categoryId, err := utils.GetDecryptId(projectData.CategoryId)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
-		return
-	}
-	staffId, err := utils.GetDecryptId(projectData.StaffId)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
-		return
-	}
+	// categoryId, err := utils.GetDecryptId(projectData.CategoryId)
+	// if err != nil {
+	// 	c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+	// 	return
+	// }
+	// staffId, err := utils.GetDecryptId(projectData.StaffId)
+	// if err != nil {
+	// 	c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+	// 	return
+	// }
 
 	// 新增项目信息
-	err = c.ServiceProject.Add(projectData, categoryId, staffId)
+	err = c.ServiceProject.Add(projectData, projectData.CategoryId, projectData.StaffId)
 	if err != nil {
 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
 		return