merge conflict issue fix

src/components/DDComponents/DepartmentField/index.js

@@ -68,34 +68,7 @@ function DepartmentField(props) {
 
   const defaultID = useMemo(() => {
     if (defaultValue !== undefined) {
-      return findDepID(depUserTree, defaultValue[0]);
-    } else {
-      return null;
-    }
-  }, [defaultValue]);
-
-  const findDepID = (list, Name) => {
-    let result = '';
-    const dep = list.find(item => item.Name === Name);
-    if (dep) {
-      result = dep.ID;
-    } else {
-      for (let index = 0; index < list.length; index++) {
-        const element = list[index];
-        if (element?.children && element?.children.length) {
-          result = findDepID(element.children, Name);
-          if (result) {
-            break;
-          }
-        }
-      }
-    }
-    return result;
-  };
-
-  const defaultID = useMemo(() => {
-    if (defaultValue !== undefined) {
-      return findDepID(depUserTree, defaultValue[0]);
+      return findDepID(depTrees, defaultValue[0]);
     } else {
       return null;
     }