Merge branch 'crm/need_1067' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company_user.go

@@ -1539,10 +1539,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 {
@@ -2531,10 +2534,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 {
@@ -2542,7 +2542,6 @@ func (this *CompanyController) PotentialUserDelete() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-
 	sysUser := this.SysUser
 	if sysUser == nil {
 		br.Msg = "请登录"
@@ -2550,6 +2549,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)