kjs
/
ERP-node
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

This commit is contained in:
kjs 2026-01-15 10:53:11 +09:00
parent 9a2b61f837 ddf5ed4006
commit 7b763fa151
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
backend-node/src/controllers/screenGroupController.ts
View File

@ -135,10 +135,10 @@ export const getScreenGroup = async (req: Request, res: Response) => {
}; };
// 화면 그룹 생성 // 화면 그룹 생성
export const createScreenGroup = async (req: Request, res: Response) => { export const createScreenGroup = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const userCompanyCode = (req.user as any).companyCode; const userCompanyCode = req.user!.companyCode;
const userId = (req.user as any).userId; const userId = req.user!.userId;
const { group_name, group_code, main_table_name, description, icon, display_order, is_active, parent_group_id, target_company_code } = req.body; const { group_name, group_code, main_table_name, description, icon, display_order, is_active, parent_group_id, target_company_code } = req.body;
if (!group_name || !group_code) { if (!group_name || !group_code) {
@ -250,10 +250,10 @@ export const createScreenGroup = async (req: Request, res: Response) => {
}; };
// 화면 그룹 수정 // 화면 그룹 수정
export const updateScreenGroup = async (req: Request, res: Response) => { export const updateScreenGroup = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const { id } = req.params; const { id } = req.params;
const userCompanyCode = (req.user as any).companyCode; const userCompanyCode = req.user!.companyCode;
const { group_name, group_code, main_table_name, description, icon, display_order, is_active, parent_group_id, target_company_code } = req.body; const { group_name, group_code, main_table_name, description, icon, display_order, is_active, parent_group_id, target_company_code } = req.body;
// 회사 코드 결정: 최고 관리자가 특정 회사를 선택한 경우 해당 회사로, 아니면 현재 그룹의 회사 유지 // 회사 코드 결정: 최고 관리자가 특정 회사를 선택한 경우 해당 회사로, 아니면 현재 그룹의 회사 유지
@ -339,10 +339,10 @@ export const updateScreenGroup = async (req: Request, res: Response) => {
}; };
// 화면 그룹 삭제 // 화면 그룹 삭제
export const deleteScreenGroup = async (req: Request, res: Response) => { export const deleteScreenGroup = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const { id } = req.params; const { id } = req.params;
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
let query = `DELETE FROM screen_groups WHERE id = $1`; let query = `DELETE FROM screen_groups WHERE id = $1`;
const params: any[] = [id]; const params: any[] = [id];
@ -375,10 +375,10 @@ export const deleteScreenGroup = async (req: Request, res: Response) => {
// ============================================================ // ============================================================
// 그룹에 화면 추가 // 그룹에 화면 추가
export const addScreenToGroup = async (req: Request, res: Response) => { export const addScreenToGroup = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
const userId = (req.user as any).userId; const userId = req.user!.userId;
const { group_id, screen_id, screen_role, display_order, is_default } = req.body; const { group_id, screen_id, screen_role, display_order, is_default } = req.body;
if (!group_id || !screen_id) { if (!group_id || !screen_id) {
@ -415,10 +415,10 @@ export const addScreenToGroup = async (req: Request, res: Response) => {
}; };
// 그룹에서 화면 제거 // 그룹에서 화면 제거
export const removeScreenFromGroup = async (req: Request, res: Response) => { export const removeScreenFromGroup = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const { id } = req.params; const { id } = req.params;
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
let query = `DELETE FROM screen_group_screens WHERE id = $1`; let query = `DELETE FROM screen_group_screens WHERE id = $1`;
const params: any[] = [id]; const params: any[] = [id];
@ -446,10 +446,10 @@ export const removeScreenFromGroup = async (req: Request, res: Response) => {
}; };
// 그룹 내 화면 순서/역할 수정 // 그룹 내 화면 순서/역할 수정
export const updateScreenInGroup = async (req: Request, res: Response) => { export const updateScreenInGroup = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const { id } = req.params; const { id } = req.params;
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
const { screen_role, display_order, is_default } = req.body; const { screen_role, display_order, is_default } = req.body;
let query = ` let query = `
@ -485,9 +485,9 @@ export const updateScreenInGroup = async (req: Request, res: Response) => {
// ============================================================ // ============================================================
// 화면 필드 조인 목록 조회 // 화면 필드 조인 목록 조회
export const getFieldJoins = async (req: Request, res: Response) => { export const getFieldJoins = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
const { screen_id } = req.query; const { screen_id } = req.query;
let query = ` let query = `
@ -526,10 +526,10 @@ export const getFieldJoins = async (req: Request, res: Response) => {
}; };
// 화면 필드 조인 생성 // 화면 필드 조인 생성
export const createFieldJoin = async (req: Request, res: Response) => { export const createFieldJoin = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
const userId = (req.user as any).userId; const userId = req.user!.userId;
const { const {
screen_id, layout_id, component_id, field_name, screen_id, layout_id, component_id, field_name,
save_table, save_column, join_table, join_column, display_column, save_table, save_column, join_table, join_column, display_column,
@ -567,10 +567,10 @@ export const createFieldJoin = async (req: Request, res: Response) => {
}; };
// 화면 필드 조인 수정 // 화면 필드 조인 수정
export const updateFieldJoin = async (req: Request, res: Response) => { export const updateFieldJoin = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const { id } = req.params; const { id } = req.params;
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
const { const {
layout_id, component_id, field_name, layout_id, component_id, field_name,
save_table, save_column, join_table, join_column, display_column, save_table, save_column, join_table, join_column, display_column,
@ -612,10 +612,10 @@ export const updateFieldJoin = async (req: Request, res: Response) => {
}; };
// 화면 필드 조인 삭제 // 화면 필드 조인 삭제
export const deleteFieldJoin = async (req: Request, res: Response) => { export const deleteFieldJoin = async (req: AuthenticatedRequest, res: Response) => {
try { try {
const { id } = req.params; const { id } = req.params;
const companyCode = (req.user as any).companyCode; const companyCode = req.user!.companyCode;
let query = `DELETE FROM screen_field_joins WHERE id = $1`; let query = `DELETE FROM screen_field_joins WHERE id = $1`;
const params: any[] = [id]; const params: any[] = [id];