develop #3

Merged
gitadmin merged 24 commits from develop into master 2026-07-02 11:38:20 +09:00
3 changed files with 8 additions and 8 deletions
Showing only changes of commit 438e6258dc - Show all commits

View File

@@ -119,12 +119,12 @@ export function AssignMonitoringDialog({
id: "area", id: "area",
header: "지역", header: "지역",
cell: ({row}) => cell: ({row}) =>
getCodeLabel(codes, "area", getDetailValue(row.original.user?.userDetail, ["area", "userArea", "region"])) || "-", getCodeLabel(codes, "area", getDetailValue(row.original.user?.userDetail, "userArea")) || "-",
}, },
{ {
id: "tel", id: "tel",
header: "연락처", header: "연락처",
cell: ({row}) => getDetailValue(row.original.user?.userDetail, ["tel", "phone", "userTel"], "-"), cell: ({row}) => getDetailValue(row.original.user?.userDetail, "userTel", "-"),
}, },
{ {
id: "status", id: "status",

View File

@@ -86,13 +86,13 @@ function AssignedUserInfo({
type: "monitoring" | "written"; type: "monitoring" | "written";
}>) { }>) {
const detail = user?.userDetail; const detail = user?.userDetail;
const tel = getDetailValue(detail, ["tel", "phone", "userTel"], "-"); const tel = getDetailValue(detail, "userTel", "-");
const email = getDetailValue(detail, ["email", "userEmail"], "-"); const email = getDetailValue(detail, "userEmail", "-");
const metaValue = type === "monitoring" const metaValue = type === "monitoring"
? getCodeLabel(codes, "area", getDetailValue(detail, ["area", "userArea", "region"])) ? getCodeLabel(codes, "area", getDetailValue(detail, "userArea"))
: getCodeLabel(codes, "genre", getDetailValue(detail, ["userGenre", "genre", "reviewGenre"])); : getCodeLabel(codes, "genre", getDetailValue(detail, "userGenre"));
const metaLabel = type === "monitoring" ? "지역" : "장르"; const metaLabel = type === "monitoring" ? "지역" : "장르";
const hasCar = getCodeLabel(codes, "has_car", getDetailValue(detail, ["userHasCar", "has_car", "hasCar"])) || "-"; const hasCar = getCodeLabel(codes, "has_car", getDetailValue(detail, "userHasCar")) || "-";
return ( return (
<div className="rounded-md border bg-muted/30 p-2 text-sm"> <div className="rounded-md border bg-muted/30 p-2 text-sm">

View File

@@ -75,7 +75,7 @@ export function SmsSendDialog({
return selectedUsers return selectedUsers
.map((user) => ({ .map((user) => ({
sid: user.userId, sid: user.userId,
destTel: getDetailValue(user.userDetail, ["userTel"]), destTel: getDetailValue(user.userDetail, "userTel"),
destNm: user.userName || user.userId, destNm: user.userName || user.userId,
msgParam: { msgParam: {
...buildUserMsgParam(user), ...buildUserMsgParam(user),