|
|
@@ -401,17 +401,18 @@ class document
|
|
|
|
|
|
static public function getAssign(float $_id = NULL){
|
|
|
|
|
|
- $idUser = is_null($_id ) ? session::getId() : $_id;
|
|
|
+ $idUser = is_null($_id) ? session::getId() : $_id;
|
|
|
$tags = user::getIdTags($idUser);
|
|
|
|
|
|
$where = NULL;
|
|
|
foreach ($tags AS $key => $value) {
|
|
|
if($key == 0){
|
|
|
- $where = "WHERE " . DB_T_DOCUMENTS . ".id_user_done IS NULL AND " . DB_T_DOCUMENT_TAGS . ".id_tags = " . $value . "";
|
|
|
+ $where = "WHERE " . DB_T_DOCUMENTS . ".id_user_done IS NULL AND (" . DB_T_DOCUMENT_TAGS . ".id_tags = " . $value . "";
|
|
|
} else {
|
|
|
$where .= " OR " . DB_T_DOCUMENT_TAGS . ".id_tags = " . $value . "";
|
|
|
}
|
|
|
}
|
|
|
+ $where .= ")";
|
|
|
|
|
|
db::query("SELECT
|
|
|
" . DB_T_DOCUMENTS . ".id,
|
|
|
@@ -475,11 +476,12 @@ class document
|
|
|
$where = NULL;
|
|
|
foreach ($_tags AS $key => $value) {
|
|
|
if($key == 0){
|
|
|
- $where = "WHERE " . DB_T_DOCUMENTS . ".id_user_done IS NULL AND " . DB_T_DOCUMENT_TAGS . ".id_tags = " . $value . "";
|
|
|
+ $where = "WHERE " . DB_T_DOCUMENTS . ".id_user_done IS NULL AND (" . DB_T_DOCUMENT_TAGS . ".id_tags = " . $value . "";
|
|
|
} else {
|
|
|
$where .= " OR " . DB_T_DOCUMENT_TAGS . ".id_tags = " . $value . "";
|
|
|
}
|
|
|
}
|
|
|
+ $where .= ")";
|
|
|
}
|
|
|
|
|
|
db::query("SELECT "
|