Merge branch 'master' of https://gitea.anxinyun.cn/wenlele/Inspection

script/1.0.0/schema/3.create_patrol_plan.sql

@@ -0,0 +1,20 @@
+DROP SEQUENCE if EXISTS "public"."patrol_plan_id_seq";
+CREATE SEQUENCE "public"."patrol_plan_id_seq" 
+INCREMENT 1
+MINVALUE  1
+MAXVALUE 9223372036854775807
+START 1
+CACHE 1;
+DROP TABLE IF EXISTS "public"."patrol_plan";
+CREATE TABLE "public"."patrol_plan" (
+  "id" int4 NOT NULL PRIMARY KEY DEFAULT nextval('patrol_plan_id_seq'::regclass),
+  "name" varchar(128) NOT NULL,
+  "way" varchar(128),
+  "structure_id" int4,
+  "start_time" timestamp(6),
+  "end_time" timestamp(6),
+  "frequency" varchar(64),
+  "points" jsonb,
+  "user_id" int4,
+  "patrol_count" int4 NOT NULL DEFAULT 0
+);

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

@@ -9,9 +9,10 @@ import ResetPwd from '../components/resetPwd';
 import DeptModal from '../components/deptModal';
 
 const TreeNode = Tree.TreeNode;
-const user = JSON.parse(sessionStorage.getItem('user'));
 
 const UserManage = (props) => {
+    const user = JSON.parse(sessionStorage.getItem('user'));
+
     const { dispatch, loading, depMessage, depUser, clientHeight } = props;
     // 部门
     const [deptModalVisible, setDeptModalVisible] = useState(false);