This commit is contained in:
AdisakKanthawilang 2025-03-06 18:25:27 +07:00
parent cfcf63b9aa
commit fa073242b8
4 changed files with 56 additions and 5 deletions

View file

@ -55,6 +55,7 @@ export class PermissionController extends Controller {
}
let reply = await getAsync("role_" + profile.id);
console.log(">>>reply",reply);
if (reply != null) {
reply = JSON.parse(reply);
} else {
@ -84,11 +85,13 @@ export class PermissionController extends Controller {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูลสิทธิ์");
}
}
console.log(">>>posMaster",posMaster);
const getDetail = await this.authRoleRepo.findOne({
select: ["id", "roleName", "roleDescription"],
where: { id: posMaster.authRoleId },
});
console.log(">>>detail",getDetail);
if (!getDetail) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
}

View file

@ -31,6 +31,7 @@ import { Profile } from "../entities/Profile";
import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer";
import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee";
import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster";
import { sendWebSocket } from "../services/webSocket";
@Route("api/v1/org/report")
@Tags("Report")
@ -1369,6 +1370,7 @@ export class ReportController extends Controller {
}
}
}
return new HttpSuccess({ template: "report1", reportName: "report1", data: { data } });
}
@ -3537,8 +3539,10 @@ export class ReportController extends Controller {
}
}
}
const metaData = { template: "report2", reportName: "report2", data: { data } };
sendWebSocket(metaData)
return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
// return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
}
/**