caipin 4 年 前
コミット
f60055397e

+ 7 - 1
models/cm_manager.go

@@ -1,3 +1,9 @@
+/*
+ * @description:
+ * @Author: CP
+ * @Date: 2020-08-20 15:47:12
+ * @FilePath: \construction_management\models\cm_manager.go
+ */
 package models
 
 import (
@@ -15,7 +21,7 @@ type CmManager struct {
 	LoginIp    string    `xorm:"comment('登录ip') VARCHAR(12)"`
 	Token      string    `xorm:"not null comment('随机token') VARCHAR(32)"`
 	CanLogin   int       `xorm:"default 1 comment('是否可登录') TINYINT(1)"`
-	Office     int       `xorm:"default 12 comment('办事处id(CLD字段)') INT(11)"`
+	Office     string    `xorm:"default 12 comment('办事处id(CLD字段)') VARCHAR(32)"`
 	Category   string    `xorm:"comment('办事处名称(CLD字段)') VARCHAR(32)"`
 	Email      string    `xorm:"comment('邮箱(CLD字段)') VARCHAR(255)"`
 	Qq         string    `xorm:"comment('qq号(CLD字段)') VARCHAR(15)"`

+ 17 - 9
services/backstage_service.go

@@ -8,7 +8,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"log"
 	"net/http"
 	"net/url"
@@ -203,8 +202,6 @@ func (s *backstageService) ValidCldStaff(loginData viewmodels.StaffCld, writer h
 		return nil, errors.New(result.Msg)
 	}
 
-	fmt.Println(result)
-
 	// 2.cld账号写入管理员表
 	managerData := s.managerDao.GetUserName(result.Data.UserName)
 	if managerData.Id == 0 {
@@ -214,15 +211,26 @@ func (s *backstageService) ValidCldStaff(loginData viewmodels.StaffCld, writer h
 		manager.Username = result.Data.UserName
 
 		manager.CreateTime = time.Now()
+		manager.UpdateTime = time.Now()
 		manager.LastLogin = time.Now()
+
 		manager.Category = result.Data.Category
-		manager.Telephone = ""
-		manager.Email = ""
-		manager.Qq = ""
-		manager.Fixedphone = ""
-		manager.Position = ""
+		manager.Office = result.Data.CategoryId
+		manager.Telephone = result.Data.Telephone
+		manager.Email = result.Data.Email
+		manager.Qq = result.Data.Qq
+		manager.Fixedphone = result.Data.Fixedphone
+		manager.Position = result.Data.Position
+
+		err := s.managerDao.Create(manager)
+		if err != nil {
+			return nil, err
+		}
+	}
 
-		// err := s.managerDao.Add(project)
+	// 2-1
+	if managerData.CanLogin == 0 {
+		return nil, errors.New("不允许登陆")
 	}
 
 	// 3.写入登录态

+ 8 - 2
web/viewmodels/backstage.go

@@ -22,8 +22,14 @@ type StaffCld struct {
 
 // 接收CLD
 type ResultCld struct {
-	UserName string `from:"username" json:"username"`
-	Category string `from:"category" json:"category"`
+	UserName   string `from:"username" json:"username"`
+	Category   string `from:"category" json:"category"`
+	CategoryId string `from:"cid" json:"cid"`
+	Qq         string `from:"qq" json:"qq"`
+	Telephone  string `from:"telephone" json:"telephone"`
+	Email      string `from:"email" json:"email"`
+	Fixedphone string `from:"phone" json:"phone"`
+	Position   string `from:"position" json:"position"`
 }
 
 func (l StaffCld) ValidateLogin() error {

+ 1 - 1
web/viewmodels/manager.go

@@ -18,7 +18,7 @@ type Manager struct {
 	LoginIp   string `form:"loginIp" json:"loginIp" `
 	// Token      string `form:"token" json:"token" `
 	CanLogin   int    `form:"canLogin" json:"canLogin" `
-	Office     int    `form:"office" json:"office" `
+	Office     string `form:"office" json:"office" `
 	Category   string `form:"category" json:"category" `
 	Email      string `form:"email" json:"email" `
 	Qq         string `form:"qq" json:"qq" `