db/routines/vn/triggers/workerTimeControl_afterDelete.sql

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

modules/ticket/back/methods/ticket-request/getItemTypeWorker.js

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