fixed:完善项目申请的时候,存入的审批人企业id不对
parent
86e2750ac4
commit
834bc83a69
|
|
@ -972,6 +972,7 @@ const UserSelectComponent = (props) => {
|
||||||
const { tableProps, getData } = useTable(props["userList"], {
|
const { tableProps, getData } = useTable(props["userList"], {
|
||||||
form,
|
form,
|
||||||
params: {
|
params: {
|
||||||
|
noMain: 1,
|
||||||
inDepartmentId,
|
inDepartmentId,
|
||||||
eqEmploymentFlag: 1, // 在职
|
eqEmploymentFlag: 1, // 在职
|
||||||
},
|
},
|
||||||
|
|
@ -1000,14 +1001,14 @@ const UserSelectComponent = (props) => {
|
||||||
if (props.onConfirm) {
|
if (props.onConfirm) {
|
||||||
// 确保项目负责人始终在选中列表中
|
// 确保项目负责人始终在选中列表中
|
||||||
const finalSelectedRows = [...selectedRows];
|
const finalSelectedRows = [...selectedRows];
|
||||||
if (projectLeader && !selectedRows.find(item => item.id === projectLeader.id)) {
|
if (projectLeader && !selectedRows.find(item => item?.id === projectLeader?.id)) {
|
||||||
finalSelectedRows.unshift(projectLeader);
|
finalSelectedRows.unshift(projectLeader);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 为选中的用户数据添加 projectLeader 字段
|
// 为选中的用户数据添加 projectLeader 字段
|
||||||
const processedRows = finalSelectedRows.map(item => ({
|
const processedRows = finalSelectedRows.map(item => ({
|
||||||
...item,
|
...item,
|
||||||
projectLeader: projectLeader && item.id === projectLeader.id ? 1 : 0,
|
projectLeader: projectLeader && item?.id === projectLeader?.id ? 1 : 0,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
props.onConfirm(processedRows);
|
props.onConfirm(processedRows);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue