verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Carlos Satorres 2025-01-13 07:14:59 +00:00
parent 6d661dba85 1cd7eda4ac
commit d547456d22
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/routines/vn/triggers/workerTimeControl_afterDelete.sql
View File

@ -3,10 +3,12 @@ CREATE OR REPLACE DEFINER=`vn`@`localhost` TRIGGER `vn`.`workerTimeControl_after
AFTER DELETE ON `workerTimeControl` AFTER DELETE ON `workerTimeControl`
FOR EACH ROW FOR EACH ROW
BEGIN BEGIN
INSERT INTO workerLog IF account.myUser_getId() IS NOT NULL THEN
SET `action` = 'delete', INSERT INTO workerLog
`changedModel` = 'WorkerTimeControl', SET `action` = 'delete',
`changedModelId` = OLD.id, `changedModel` = 'WorkerTimeControl',
`userFk` = account.myUser_getId(); `changedModelId` = OLD.id,
`userFk` = account.myUser_getId();
END IF;
END$$ END$$
DELIMITER ; DELIMITER ;

2
modules/ticket/back/methods/ticket-request/getItemTypeWorker.js
View File

@ -30,7 +30,7 @@ module.exports = Self => {
Object.assign(myOptions, options); Object.assign(myOptions, options);
const query = const query =
`SELECT DISTINCT u.id, u.nickname `SELECT DISTINCT u.id, u.nickname, w.firstName, w.lastName
FROM itemType it FROM itemType it
JOIN worker w ON w.id = it.workerFk JOIN worker w ON w.id = it.workerFk
JOIN account.user u ON u.id = w.id`; JOIN account.user u ON u.id = w.id`;