Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

web/client/src/sections/organization/components/depModal.js

@@ -11,7 +11,8 @@ const DepModal = (props) => {
       if (depModalType === 'edit') {
         let value = {
           name: values.name,
-          depId: data.id
+          depId: data.id,
+          dependence:values.dependence
         }
         onConfirm(value)
       } else {

web/client/src/sections/organization/containers/user.js

@@ -168,7 +168,10 @@ const UserManage = (props) => {
     }
     //部门新增及编辑
     const onDepConfirm = (data) => {
+        console.log('depModalType:',depModalType);
+        console.log('data:',data);
         if (depModalType == 'edit') {
+        
             dispatch(updateDep(data)).then(res => {
                 if (res.success) {
                     setDepModalVisible(false);