bug fix

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -919,18 +919,25 @@ const AssetAction = (props) => {
     } else if (changedValues.hasOwnProperty('主题域')) {
       setCurrentBussinessDomain(changedValues['主题域']);
       form.setFieldsValue({'业务对象': ''});
+    } else if (changedValues.hasOwnProperty('数据关键用户')) {
+      if (changedValues['数据关键用户']) {
+        const index = (users||[]).findIndex(item => item.pernr === changedValues['数据关键用户']);
+        if (index !== -1) {
+          form.setFieldsValue({'数据关键用户姓名': users[index].nachn});
+        }
+      }
     } else if (changedValues.hasOwnProperty('业务数据Owner')) {
       if (changedValues['业务数据Owner']) {
         const index = (users||[]).findIndex(item => item.pernr === changedValues['业务数据Owner']);
         if (index !== -1) {
-          form.setFieldsValue({'业务责任部门': users[index].orgtx});
+          form.setFieldsValue({'业务数据Owner姓名': users[index].nachn, '业务责任部门': users[index].orgtx});
         }
       }
     } else if (changedValues.hasOwnProperty('IT责任人')) {
       if (changedValues['IT责任人']) {
         const index = (users||[]).findIndex(item => item.pernr === changedValues['IT责任人']);
         if (index !== -1) {
-          form.setFieldsValue({'IT责任部门': users[index].orgtx});
+          form.setFieldsValue({'IT责任人姓名': users[index].nachn, 'IT责任部门': users[index].orgtx});
         }
       }
     }

src/view/Manage/AssetManage/Component/AssetTable.jsx

@@ -250,25 +250,25 @@ const AssetTable = (props) => {
 
   const realAssets = useMemo(() => {
     const newAssets = [...assets];
-    if (users?.length > 0 && assets?.length > 0 && columns?.length > 0) {
-      const specialCol = ['数据关键用户', '业务数据owner', 'it责任人', '创建人', '更新人'];
-
-      const indexArray = [];
-      columns.forEach((item, index) => {
-        if (specialCol.indexOf(item.title?.toLowerCase()) !== -1) {
-          indexArray.push(index);
-        }
-      });
+    // if (users?.length > 0 && assets?.length > 0 && columns?.length > 0) {
+    //   const specialCol = ['数据关键用户', '业务数据owner', 'it责任人', '创建人', '更新人'];
+
+    //   const indexArray = [];
+    //   columns.forEach((item, index) => {
+    //     if (specialCol.indexOf(item.title?.toLowerCase()) !== -1) {
+    //       indexArray.push(index);
+    //     }
+    //   });
       
-      newAssets?.forEach((item) => {
-        indexArray?.forEach(index => {
-          const user = users?.filter((user)=>(user.pernr===item[`element${index+1}`]));
-          if (user && user.length > 0) {
-            item[`element${index+1}`] = user[0].nachn?`${user[0].nachn}(${user[0].pernr})`:user[0].pernr;
-          }
-        })
-      })
-    }
+    //   newAssets?.forEach((item) => {
+    //     indexArray?.forEach(index => {
+    //       const user = users?.filter((user)=>(user.pernr===item[`element${index+1}`]));
+    //       if (user && user.length > 0) {
+    //         item[`element${index+1}`] = user[0].nachn?`${user[0].nachn}(${user[0].pernr})`:user[0].pernr;
+    //       }
+    //     })
+    //   })
+    // }
 
     return newAssets;
   }, [users, assets, columns])

src/view/Manage/Model/Component/SelectUsers.jsx

@@ -52,27 +52,33 @@ const SelectUser:React.FC=(props)=>{
             </Select>
         )
     }else if(type==='detail'){
-        try {
-            const user = (users??[]).filter((item)=>(item.pernr===value))
-            let publishedUser = null;
-            if (publishedValue && publishedValue !== value) {
-                publishedUser = (users??[]).filter((item)=>(item.pernr===publishedValue))
+        return <span>
+            <Typography.Text>{highlightSearchContentByTerms(value, terms)}</Typography.Text>
+            {
+                publishedValue && publishedValue!==value && <Typography.Text className='ml-2' type='danger'><del>{publishedValue}</del></Typography.Text>
             }
+        </span>
+        // try {
+        //     const user = (users??[]).filter((item)=>(item.pernr===value))
+        //     let publishedUser = null;
+        //     if (publishedValue && publishedValue !== value) {
+        //         publishedUser = (users??[]).filter((item)=>(item.pernr===publishedValue))
+        //     }
 
-            return <span>
-                <Typography.Text>{highlightSearchContentByTerms(`${user[0].nachn}(${user[0].pernr})`, terms)}</Typography.Text>
-                {
-                    publishedUser && <Typography.Text className='ml-2' type='danger'><del>{`${publishedUser[0].nachn}(${publishedUser[0].pernr})`}</del></Typography.Text>
-                }
-            </span>;
-        } catch (error) {
-            return <span>
-               <Typography.Text>{highlightSearchContentByTerms(value, terms)}</Typography.Text>
-               {
-                   publishedValue && publishedValue!==value && <Typography.Text className='ml-2' type='danger'><del>{publishedValue}</del></Typography.Text>
-               }
-            </span>
-        }
+        //     return <span>
+        //         <Typography.Text>{highlightSearchContentByTerms(`${user[0].nachn}(${user[0].pernr})`, terms)}</Typography.Text>
+        //         {
+        //             publishedUser && <Typography.Text className='ml-2' type='danger'><del>{`${publishedUser[0].nachn}(${publishedUser[0].pernr})`}</del></Typography.Text>
+        //         }
+        //     </span>;
+        // } catch (error) {
+        //     return <span>
+        //        <Typography.Text>{highlightSearchContentByTerms(value, terms)}</Typography.Text>
+        //        {
+        //            publishedValue && publishedValue!==value && <Typography.Text className='ml-2' type='danger'><del>{publishedValue}</del></Typography.Text>
+        //        }
+        //     </span>
+        // }
     }else{
         return null
     }