Merge branch 'master' into feature/v2.9.31

entbase/src/go.mod

@@ -5,8 +5,8 @@ go 1.18
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230725073704-a2ce1f2059bf
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
+	app.yhyue.com/moapp/jypkg v0.0.0-20230928085211-01fc36fa72f5
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14
 	github.com/dchest/captcha v1.0.0
 	github.com/gogf/gf/v2 v2.0.6
 	go.mongodb.org/mongo-driver v1.11.6
@@ -17,7 +17,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
 	app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae // indirect
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 // indirect
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
 	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 // indirect
 	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -81,7 +81,7 @@ require (
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/sirupsen/logrus v1.8.3 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
@@ -132,7 +132,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/mysql v1.0.5 // indirect
 	gorm.io/gorm v1.21.3 // indirect
-	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230630032508-eefb06a4588e // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 // indirect
 	k8s.io/api v0.26.3 // indirect
 	k8s.io/apimachinery v0.27.0-alpha.3 // indirect
 	k8s.io/client-go v0.26.3 // indirect

entbase/src/go.sum

@@ -9,18 +9,18 @@ app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b h1:Wtytm2QqQWtBV+s
 app.yhyue.com/moapp/jybase v0.0.0-20230718012114-37013054344b/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=
-app.yhyue.com/moapp/jypkg v0.0.0-20230725073704-a2ce1f2059bf h1:MSfsZbhvZTSb0mKtqbjoJb65HvHk0eKN8OwadHv8WEs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230725073704-a2ce1f2059bf/go.mod h1:xEZ6Ghkt9KcU7zBBqt6t03AkZjiQz1acyFL2WEIFGJs=
+app.yhyue.com/moapp/jypkg v0.0.0-20230928085211-01fc36fa72f5 h1:sgWLzHx2YZ4OmIEy47pCJdm7aLEE70cN701BaaUhf8g=
+app.yhyue.com/moapp/jypkg v0.0.0-20230928085211-01fc36fa72f5/go.mod h1:gPCOY8bVXdY5bD7nry7th+YNkKC/viG8Dc9+z4fUaRo=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e/go.mod h1:7Xhygw0KBuL4h0G76FnFg4otQcA9bmOO0c8M0FCjAyQ=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447 h1:hrBqrsf2QHTrnoR9VTV4w7g2akDfbpQ+umNQvkkNs+Y=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230222052351-9d6fad062447/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7 h1:G6PHMWAHfYEuY6kbl7OM/KnCQf1Xa54mdhuP7JzK8/I=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.7/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13 h1:aK3ya7aznINdAuEl7sKq9U2MvJidUfk6nxPGjjX+t3Y=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13/go.mod h1:vDEKni2rnCraKgKnnCEIwsFmO92GxnpfKmNQ+83wKP0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14 h1:L/0RrgU+l8nMS7YO2JizszaX3lAo0gqzg2Bqmu0So0s=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.14/go.mod h1:03M9BWIGHy7BbGxLvjt8V9zZzEZDWhN6BuHVfVcDFbQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
@@ -735,8 +735,8 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.8.3 h1:DBBfY8eMYazKEJHb3JKpSPfpgd2mBCoNFlQx6C5fftU=
+github.com/sirupsen/logrus v1.8.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
@@ -1409,8 +1409,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230630032508-eefb06a4588e h1:1O11hFuKvLD3Ls+9wxssUpMV3fG9qD4EfeeAy92dsWY=
-jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230630032508-eefb06a4588e/go.mod h1:wBxeFODhYtGenkxXJGThN/VrFaxPvvHMxzpS09pxApM=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1 h1:BItxi1gkQUs3sjxaBk6tc34fZWSO4hUSXcTM3PcnY4I=
+jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20230710093759-d9d6c68de8b1/go.mod h1:p/595fgbj4r6GhSJhHDpx3Ru1NkD5UASFL8OuIQw09E=
 k8s.io/api v0.22.9/go.mod h1:rcjO/FPOuvc3x7nQWx29UcDrFJMx82RxDob71ntNH4A=
 k8s.io/api v0.26.3 h1:emf74GIQMTik01Aum9dPP0gAypL8JTLl/lHa4V9RFSU=
 k8s.io/api v0.26.3/go.mod h1:PXsqwPMXBSBcL1lJ9CYDKy7kIReUydukS5JiRlxC3qE=

entbase/src/service/person/person.go

@@ -77,6 +77,7 @@ func (a *Action) OrgAdd() {
 		return
 	}
 	name := a.GetString("name")
+
 	mail := a.GetString("email")
 	if phone == "" && a.GetSession("userId") != nil {
 		userId, _ := a.GetSession("userId").(string)
@@ -453,11 +454,19 @@ func (a *Action) Add() {
 		name = string([]rune(name)[:30])
 	}
 	phone := a.GetString("phone")
+	user_name := a.GetString("user_name")
 	mail := a.GetString("mail")
 	if mail != "" && !jy.IsEmail(mail) {
 		R.InvalidReqParam(a.ResponseWriter, a.Request, "name")
 		return
 	}
+	userName := a.GetString("user_name")
+	if userName != "" && len(userName) > 0 {
+		if !VarUser.UserNameExist(userName, a.GetString("phone")) {
+			a.ServeJson(Result{Data: M{"status": 0}, Error_msg: "账户名已存在", Error_code: -2})
+			return
+		}
+	}
 	status, user_id := func() (int, int64) {
 		if VarUser.AddIsExists(frameworkEntId, phone) {
 			return -1, 0
@@ -467,10 +476,11 @@ func (a *Action) Add() {
 		var user_id int64
 		if Mysql.ExecTx("新增员工", func(tx *sql.Tx) bool {
 			uid, ok := VarUser.Add(tx, frameworkEntId, &User{
-				Dept_id: id,
-				Name:    name,
-				Mail:    mail,
-				Phone:   phone,
+				Dept_id:   id,
+				Name:      name,
+				Mail:      mail,
+				Phone:     phone,
+				User_name: user_name,
 			}, Config.PaymentAddress, "", Config.Nsq, Config.Nsq_Topic)
 			user_id = uid
 			return ok
@@ -564,6 +574,7 @@ func (a *Action) Detail() {
 			"phone":     user.Phone,
 			"role":      user.Role,
 			"mail":      user.Mail,
+			"user_name": user.User_name,
 		},
 	})
 }
@@ -610,7 +621,13 @@ func (a *Action) Update() {
 		return
 	}
 	status := 0
-
+	userName := a.GetString("user_name")
+	if userName != "" && len(userName) > 0 {
+		if !VarUser.UserNameExist(userName, a.GetString("phone")) {
+			a.ServeJson(Result{Data: M{"status": status}, Error_msg: "账户名已存在", Error_code: -2})
+			return
+		}
+	}
 	if a.GetString("phone") != "" && a.GetString("name") != "" {
 		// 开放更新手机号和用户名  20210429 海康威视需求添加
 		// 1. 查询一下手机号是否已存在
@@ -627,11 +644,12 @@ func (a *Action) Update() {
 		var updateUser = &CurrentUser{}
 		entinfo := updateUser.EntInfo(frameworkEntId, id)
 		// 管理员则需要改entniche_info entniche_user 两张表以及jyqyfw user表  普通用户一张表
-		if VarUser.UpdateInfo(a.GetString("mail"), a.GetString("phone"), a.GetString("name"), id, did, frameworkEntId, entinfo.Ent.Phone, entinfo.Ent.Name, entinfo.Role_admin_system) {
+		if VarUser.UpdateInfo(a.GetString("mail"), a.GetString("phone"), a.GetString("name"), id, did, frameworkEntId, entinfo.Ent.Phone, entinfo.Ent.Name, a.GetString("user_name"), entinfo.Role_admin_system) {
 			status = 1
 		}
 	} else if VarUser.Update(a.GetString("mail"), id, did, frameworkEntId) {
 		status = 1
 	}
+
 	a.ServeJson(Result{Data: M{"status": status}})
 }

entbase/src/service/power/power.go

@@ -28,7 +28,6 @@ type Action struct {
 	pcSearchDepartment xweb.Mapper `xweb:"/power/pcSearchDepartment"` //pc我的企业-人员管理-部门筛选
 }
 
-//
 func (a *Action) Set() {
 	if !R.CheckReqParam(a.ResponseWriter, a.Request, "id") {
 		return
@@ -99,7 +98,6 @@ func (a *Action) Set() {
 	a.ServeJson(Result{Data: M{"status": status}})
 }
 
-//
 func (a *Action) Persons() {
 	entId := qutil.IntAll(a.GetSession("entId"))
 	r := Mysql.SelectBySql(`SELECT a.id,a.pid,a.name,c.id as user_id,c.name as user_name,c.phone as user_phone,c.power as user_power,e.name as role from entniche_department a 
@@ -147,7 +145,7 @@ func (a *Action) Persons() {
 	}})
 }
 
-//我的企业-人员管理
+// 我的企业-人员管理
 func (a *Action) PcPersons() {
 	entId := qutil.IntAll(a.GetSession("entId"))
 	//公用分页
@@ -180,7 +178,7 @@ func (a *Action) PcPersons() {
 		}
 	}
 
-	r := Mysql.SelectBySql(`SELECT a.id,a.pid,a.name,c.id as user_id,c.name as user_name,c.phone as user_phone,c.mail,c.power as user_power,e.name as role from entniche_department a 
+	r := Mysql.SelectBySql(`SELECT a.id,a.pid,a.name,c.id as user_id,c.name as user_name,c.user_name as userName,c.phone as user_phone,c.mail,c.power as user_power,e.name as role from entniche_department a 
 			INNER JOIN entniche_department_user b on (a.ent_id=? and a.id=b.dept_id) 
 			INNER JOIN entniche_user c on (b.user_id=c.id) 
 			LEFT JOIN entniche_user_role d on (c.id=d.user_id) 
@@ -210,13 +208,14 @@ func (a *Action) PcPersons() {
 		}
 		user_id := qutil.IntAll(v["user_id"])
 		m := map[string]interface{}{
-			"id":    user_id,
-			"dname": qutil.ObjToString(v["name"]),
-			"power": user_power,
-			"name":  qutil.ObjToString(v["user_name"]),
-			"mail":  qutil.ObjToString(v["mail"]),
-			"phone": qutil.ObjToString(v["user_phone"]),
-			"role":  qutil.ObjToString(v["role"]),
+			"id":        user_id,
+			"dname":     qutil.ObjToString(v["name"]),
+			"power":     user_power,
+			"name":      qutil.ObjToString(v["user_name"]),
+			"mail":      qutil.ObjToString(v["mail"]),
+			"phone":     qutil.ObjToString(v["user_phone"]),
+			"role":      qutil.ObjToString(v["role"]),
+			"user_name": qutil.ObjToString(v["userName"]),
 		}
 		if currentUser.Role_admin_system {
 			m["iscanedit"] = true
@@ -240,7 +239,7 @@ func (a *Action) PcPersons() {
 	}})
 }
 
-//我的企业-人员管理
+// 我的企业-人员管理
 func (a *Action) PcSearchDepartment() {
 	entId := qutil.IntAll(a.GetSession("entId"))
 	list := []M{}