Merge remote-tracking branch 'origin/master'

app/model/admin/user/user.go

@@ -160,6 +160,8 @@ func GetAdminList(req *SearchReq) (total, page int, userList []*Entity, err erro
 		req.PageNum = 1
 	}
 	page = req.PageNum
+	// 排除password字段
+	userModel = userModel.FieldsEx("user_password")
 	userList, err = userModel.Page(page, req.PageSize).Order("id asc").All()
 	return
 }

app/service/admin/auth_service/auth_rule.go

@@ -232,6 +232,10 @@ func AddUserPost(postIds []int64, userId int64) (err error) {
 		g.Log().Error(err)
 		err = gerror.New("设置用户岗位信息失败")
 	}
+	//岗位为空
+	if len(postIds) < 1 {
+		return
+	}
 	//添加用户岗位信息
 	err = user_post.AddUserPost(postIds, userId)
 	if err != nil {