修改身份证加密后判重问题

jjb.config.js

@@ -11,6 +11,7 @@ module.exports = {
 
       // 接口服务地址
       API_HOST: "http://192.168.20.100:30140",
+      // API_HOST: "https://gbs-gateway.qhdsafety.com",
     },
     production: {
       // 应用后端分支名称，部署上线需要
@@ -26,8 +27,8 @@ module.exports = {
   contextInject: {
     // 应用Key
     appKey: "",
-    fileUrl: "http://192.168.20.240:9787/mnt/",
+    // fileUrl: "http://192.168.20.240:9787/mnt/",
-    // fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
+    fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
   },
   // public/index.html注入全局变量
   windowInject: {
@@ -42,9 +43,7 @@ module.exports = {
       },
     },
     // 注入js链接集合
-    scripts: [
+    scripts: [],
-      "https://api.map.baidu.com/api?v=1.0&type=webgl&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr",
-    ],
   },
   // 开发服务
   server: {

src/pages/Container/Enterprise/EnterpriseMiddleground/ChangeView/index.js

@@ -16,7 +16,6 @@ function ChangeView(props) {
       if (res.data) {
         setInfo(res.data);
       }
-
     });
   }, []);
 
@@ -140,6 +139,7 @@ function ChangeView(props) {
         />
         <Divider orientation="left">{queryParams["type"] === "disposal" ? "未完成工作" : "工作交接"}</Divider>
         <Table
+          pagination={false}
           columns={[
             {
               title: "工作项目",

src/pages/Container/Enterprise/EnterpriseMiddleground/List/index.js

@@ -42,6 +42,8 @@ function List(props) {
     const key = selectedKeys[0] || null;
     setSelectedNodeId(key);
     getData();
+
+
   };
   return (
     <div>
@@ -57,7 +59,7 @@ function List(props) {
             borderRight: "10px solid #f1f1f2",
             paddingRight: "10px",
             marginRight: "10px",
-            height: "100vh",
+            height: "calc(100dvh - 112px)",
           }}
           >
             <LeftTree onSelect={onTreeChange} />

src/pages/Container/Enterprise/OrganizationStructure/index.js

@@ -108,7 +108,7 @@ function OrganizationStructure(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
           <LeftTree key={treeKey} onGetNodePaths={onGetNodePaths} />

src/pages/Container/Enterprise/Post/index.js

@@ -69,7 +69,7 @@ function Post(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
           <LeftTree onSelect={onTreeChange} />

src/pages/Container/Enterprise/User/Add/index.js

@@ -179,7 +179,7 @@ function Add(props) {
       return;
     }
     props["verifyUser"]({
-      userIdCard: debouncedUserIdCard,
+      userIdCard: btoa(debouncedUserIdCard),
       id: queryParams["id"] ?? "",
     }).then((res) => {
       if (!res.success) {

src/pages/Container/Enterprise/User/List/index.js

@@ -40,6 +40,7 @@ function List(props) {
   const { downloadBlob } = useDownloadBlob();
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
   const { importFile } = useImportFile();
+  const [treeKey, setTreeKey] = useState(0);
   const { tableProps, getData } = useTable(props["userList"], {
     form,
     transform: (formData) => {
@@ -105,6 +106,7 @@ function List(props) {
       if (res.success) {
         message.success("导入成功");
         getData();
+        setTreeKey(prev => prev + 1);
       }
     });
   };
@@ -125,10 +127,10 @@ function List(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
-          <LeftTree onSelect={onTreeChange} />
+          <LeftTree onSelect={onTreeChange} key={treeKey} />
         </div>
 
         <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
@@ -211,11 +213,11 @@ function List(props) {
                 dataIndex: "name",
               },
               {
-                title: "部门",
+                title: "所属部门",
                 dataIndex: "departmentName",
               },
               {
-                title: "岗位",
+                title: "所属岗位",
                 dataIndex: "postName",
               },
               // {

src/pages/Container/Stakeholder/Department/index.js

@@ -123,7 +123,7 @@ function Department(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
           <LeftTree key={treeKey} onGetNodePaths={onGetNodePaths} />

src/pages/Container/Stakeholder/User/Add/index.js

@@ -190,7 +190,7 @@ function Add(props) {
       return;
     }
     props["verifyUser"]({
-      userIdCard: debouncedUserIdCard,
+      userIdCard: btoa(debouncedUserIdCard),
       id: queryParams["id"] ?? "",
     }).then((res) => {
       if (!res.success) {

src/pages/Container/Stakeholder/User/List/index.js

@@ -91,7 +91,7 @@ function List(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
           <LeftTree onSelect={onTreeChange} />
@@ -105,10 +105,10 @@ function List(props) {
                 name: "likeName",
                 label: "姓名",
               },
-              {
+              // {
-                name: "likeUserIdCard",
+              //   name: "likeUserIdCard",
-                label: "身份证号",
+              //   label: "身份证号",
-              },
+              // },
 
             ]}
             onFinish={getData}
@@ -165,6 +165,7 @@ function List(props) {
                       && (
                         <Button
                           type="link"
+
                           onClick={() => {
                             setAddModalOpen(true);
                             setCurrentId(record.id);
@@ -180,6 +181,7 @@ function List(props) {
                       && (
                         <Button
                           type="link"
+                          hidden={record.employmentFlag === 0}
                           onClick={() => onResetPassword(record.id)}
                         >
                           重置密码
@@ -191,6 +193,7 @@ function List(props) {
                       && (
                         <Button
                           type="link"
+                          hidden={record.employmentFlag === 0}
                           onClick={() => {
                             props.history.push(`./add?id=${record.id}`);
                           }}

src/pages/Container/Stakeholder/User/ResignationReview/index.js

@@ -113,6 +113,7 @@ function ResignationReview(props) {
 
         <Divider orientation="left"> 未完成工作</Divider>
         <Table
+          pagination={false}
           columns={[
             {
               title: "工作项目",

src/pages/Container/Supervision/BranchCompany/SubsidiaryUser/UserList/index.js

@@ -121,11 +121,16 @@ function AddModalComponent(props) {
         const res = await props.requestDetails({
           id: props.currentId,
         });
+        if (res.data && res.data.userAvatarUrl) {
           res.data.userAvatarUrl = [
             {
               filePath: res.data.userAvatarUrl,
             },
           ];
+        }
+        else {
+          res.data.userAvatarUrl = [];
+        }
 
         setInfo(res.data);
       };

src/pages/Container/Supervision/EnterpriseMiddleground/ChangeView/index.js

@@ -139,6 +139,7 @@ function ChangeView(props) {
         />
         <Divider orientation="left">{queryParams["type"] === "disposal" ? "未完成工作" : "工作交接"}</Divider>
         <Table
+          pagination={false}
           columns={[
             {
               title: "工作项目",

src/pages/Container/Supervision/Supervision/Department/index.js

@@ -136,7 +136,7 @@ function Department(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
           <LeftTree key={treeKey} onSelect={onTreeChange} onGetNodePaths={onGetNodePaths} onGetData={data => setDepartmentData(data)} />

src/pages/Container/Supervision/Supervision/Post/index.js

@@ -65,7 +65,7 @@ function Post(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
           <LeftTree onSelect={onTreeChange} />

src/pages/Container/Supervision/Supervision/User/Add/index.js

@@ -55,6 +55,18 @@ function Add(props) {
   const debouncedUsernameValue = useDebounce(usernameValue, 600);
   const debouncedPhoneValueValue = useDebounce(phoneValue, 600);
 
+  const fnChoiceDepartment = async (event) => {
+    form.setFieldsValue({
+      postId: undefined,
+    });
+    // setDepartmentName(event[0].name)
+    props["postAll"]({
+      corpFlag: 1,
+      departmentId: event[event.length - 1].id,
+    }).then((res) => {
+      setPostData(res.data);
+    });
+  };
   // const { loading: getFileLoading, getFile } = useGetFile();
   const { loading: uploadFileLoading, uploadFile } = useUploadFile();
   useEffect(() => {
@@ -152,18 +164,7 @@ function Add(props) {
       });
     }
   };
-  const fnChoiceDepartment = async (event) => {
+
-    form.setFieldsValue({
-      postId: undefined,
-    });
-    // setDepartmentName(event[0].name)
-    props["postAll"]({
-      corpFlag: 1,
-      departmentId: event[event.length - 1].id,
-    }).then((res) => {
-      setPostData(res.data);
-    });
-  };
   // 校验身份证重复
   useEffect(() => {
     if (!debouncedUserIdCard) {
@@ -175,8 +176,9 @@ function Add(props) {
       ]);
       return;
     }
+
     props["verifyUser"]({
-      userIdCard: debouncedUserIdCard,
+      userIdCard: btoa(debouncedUserIdCard),
       id: queryParams["id"] ?? "",
     }).then((res) => {
       if (!res.success) {

src/pages/Container/Supervision/Supervision/User/List/index.js

@@ -32,6 +32,7 @@ function List(props) {
   const [rolesData, setRolesData] = useState([]);
   const { downloadBlob } = useDownloadBlob();
   const { importFile } = useImportFile();
+  const [treeKey, setTreeKey] = useState(0);
   const [form] = Form.useForm();
   const { tableProps, getData } = useTable(props["userList"], {
     form,
@@ -104,6 +105,7 @@ function List(props) {
       if (res.success) {
         message.success("导入成功");
         getData();
+        setTreeKey(prev => prev + 1);
       }
     });
     // message.success("导入成功");
@@ -124,10 +126,10 @@ function List(props) {
           borderRight: "10px solid #f1f1f2",
           paddingRight: "10px",
           marginRight: "10px",
-          height: "100vh",
+          height: "calc(100dvh - 112px)",
         }}
         >
-          <LeftTree onSelect={onTreeChange} />
+          <LeftTree onSelect={onTreeChange} key={treeKey} />
         </div>
         <div style={{ flex: 1, display: "flex", flexDirection: "column", minHeight: 0, padding: "20px 0" }}>
           <Search