pwd

models/sysuser/sysuser.go

@@ -55,9 +55,17 @@ func (m *SysuserDAO) GetSysuserById(userId string) (*model.SysUser, error) {
 	}
 	return nil, err
 }
+func (m *SysuserDAO) GetSysuserByOrgId(orgId string) (*model.SysUser, error) {
+	var user []model.SysUser
+	sql := `SELECT * from sys_user where org_id = '` + orgId + `'`
+	err := m.db.Sql(sql).Find(&user)
+	if len(user) > 0 {
+		return &user[0], err
+	}
+	return nil, err
+}
 func (m *SysuserDAO) AddUser(user model.SysUser) (*model.SysUser, error) {
 	user.CreateDate = time.Now()
-	user.UserId = utils.GetGUID()
 	user.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(user)
 	return &user, err

service/sysorg/sysorg.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"wechat-conf/models/model"
 	"wechat-conf/models/sysorg"
+	"wechat-conf/models/sysuser"
 	"wechat-conf/models/wechat"
 	"wechat-conf/models/wechatmenu"
 	"wechat-conf/service"
@@ -16,6 +17,7 @@ type SysorgServ struct {
 	dao       *sysorg.SysorgDAO
 	mdao      *wechatmenu.WechatMenuDAO
 	wechatdao *wechat.WechatDAO
+	userdao   *sysuser.SysuserDAO
 }
 
 // NewSysorgServ 初始化
@@ -25,6 +27,7 @@ func NewSysorgServ(ctx *utils.Context) *SysorgServ {
 		dao:       sysorg.NewSysorgDAO(ctx),
 		mdao:      wechatmenu.NewWechatMenuDAO(ctx),
 		wechatdao: wechat.NewWechatDAO(ctx),
+		userdao:   sysuser.NewSysuserDAO(ctx),
 	}
 }
 func (s *SysorgServ) GetOrgList(page, pageSize int) (map[string]interface{}, error) {
@@ -74,7 +77,17 @@ func (s *SysorgServ) AuthOrg(org model.SysOrg) error {
 	return nil
 }
 func (s *SysorgServ) DeleteOrg(orgId string) error {
-	err := s.dao.DeleteOrg(orgId)
+	var err error
+	var user *model.SysUser
+	user, err = s.userdao.GetSysuserByOrgId(orgId)
+	if err != nil {
+		utils.LogError("删除项目失败: " + err.Error())
+		return errors.New("删除项目失败")
+	}
+	if user != nil {
+		return errors.New("当前项目已被用户绑定，请先进行解绑操作")
+	}
+	err = s.dao.DeleteOrg(orgId)
 	if err != nil {
 		utils.LogError("删除项目失败: " + err.Error())
 		return errors.New("删除项目失败")

service/sysuser/sysuser.go

@@ -6,6 +6,8 @@ import (
 	"wechat-conf/models/sysuser"
 	"wechat-conf/service"
 	"wechat-conf/utils"
+
+	"github.com/yl10/kit/encrypt"
 )
 
 // SysuserServ 用户
@@ -55,6 +57,8 @@ func (s *SysuserServ) SaveUser(user model.SysUser) (*model.SysUser, error) {
 	var newUser *model.SysUser
 	var err error
 	if user.UserId == "" {
+		user.UserId = utils.GetGUID()
+		user.Pwd = encrypt.Md5(encrypt.Md5("123456"), user.UserId)
 		newUser, err = s.dao.AddUser(user)
 	} else {
 		err = s.dao.EditUser(user)