|
@@ -1508,10 +1508,13 @@ func (this *CompanyUserController) DeleteUser() {
|
|
|
br.Ret = 408
|
|
|
return
|
|
|
}
|
|
|
- //禁止删除
|
|
|
- br.Msg = "删除失败"
|
|
|
- br.ErrMsg = "删除失败"
|
|
|
- return
|
|
|
+ if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
|
|
|
+ //非admin 禁止删除
|
|
|
+ br.Msg = "删除失败"
|
|
|
+ br.ErrMsg = "删除失败"
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
var req company.DeleteUserReq
|
|
|
err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
if err != nil {
|
|
@@ -2495,10 +2498,7 @@ func (this *CompanyController) PotentialUserDelete() {
|
|
|
this.Data["json"] = br
|
|
|
this.ServeJSON()
|
|
|
}()
|
|
|
- //禁止删除
|
|
|
- br.Msg = "删除失败"
|
|
|
- br.ErrMsg = "删除失败"
|
|
|
- return
|
|
|
+
|
|
|
var req models.PotentialUserDeleteReq
|
|
|
err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
|
|
|
if err != nil {
|
|
@@ -2506,7 +2506,6 @@ func (this *CompanyController) PotentialUserDelete() {
|
|
|
br.ErrMsg = "参数解析失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
sysUser := this.SysUser
|
|
|
if sysUser == nil {
|
|
|
br.Msg = "请登录"
|
|
@@ -2514,6 +2513,12 @@ func (this *CompanyController) PotentialUserDelete() {
|
|
|
br.Ret = 408
|
|
|
return
|
|
|
}
|
|
|
+ if sysUser.RoleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
|
|
|
+ //非admin 禁止删除
|
|
|
+ br.Msg = "删除失败"
|
|
|
+ br.ErrMsg = "删除失败"
|
|
|
+ return
|
|
|
+ }
|
|
|
|
|
|
//删除用户
|
|
|
err = services.DeleteWxUser(req.UserId)
|