From 9c51db1842697c3b20b03b73687ac7240b1f2ab9 Mon Sep 17 00:00:00 2001
From: herenshan112 <herenshan112@163.com>
Date: Mon, 24 Jun 2024 15:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E5=B1=9E=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/systemunit/deptOrgPage.vue | 17 +++++++++++++----
 src/widget/systemunit/editTime.vue    | 22 ++++++++++++++--------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/widget/systemunit/deptOrgPage.vue b/src/widget/systemunit/deptOrgPage.vue
index f35932d47..7f1f1c9b5 100644
--- a/src/widget/systemunit/deptOrgPage.vue
+++ b/src/widget/systemunit/deptOrgPage.vue
@@ -166,20 +166,28 @@ onMounted(()=>{
 	orgLoading.value = true
 	getUserCont()
 		.then((data:any)=>{
-			console.log("获取中午",data)
+			// console.log("获取中午",data)
 			let orgId = data.data.organization*1
 			let companyId = data.data.company*1
-			if(companyId == null || orgId == ""){
+			if(companyId == null || companyId == "" || companyId == "0" || companyId == 0){
 				companyId = 309
 			}
+			if (orgId == null || orgId == "" || orgId == "0" || orgId == 0){
+				orgId = ""
+			}
 			nextTick(()=>{
 				govthree({id:companyId,all:1})
 					.then(({data})=>{
-						console.log("获取行政组织",data,value.value)
+						// console.log("获取行政组织",data,value.value)
+						// console.log("获取行---->政组织",Number.isNaN(value.value),isNaN(value.value))
 						orgList.value = data
-						if(value.value == null || value.value == "" || value.value == undefined){
+						if(Number.isNaN(value.value) || isNaN(value.value) || value.value == null || value.value == "" || value.value == "0" || value.value == 0 || value.value == undefined ){
 							nextTick(()=>{
 								value.value = orgId
+
+								// console.log("行政组织",orgList.value)
+								// console.log("我的组织",value.value)
+								// console.log("我的组织1111",orgId)
 							})
 						}
 						
@@ -189,6 +197,7 @@ onMounted(()=>{
 					})
 			})
 		})
+		
 })
 </script>
 <template>
diff --git a/src/widget/systemunit/editTime.vue b/src/widget/systemunit/editTime.vue
index 8b7b63f63..39471937f 100644
--- a/src/widget/systemunit/editTime.vue
+++ b/src/widget/systemunit/editTime.vue
@@ -152,14 +152,20 @@ const value = computed({
 @ 功能: 时间戳转日期
 */
 const unixTimeToDayTime = (val:string) => {
-	let date = new Date(val * 1000);
-	let Y = date.getFullYear() + "-";
-	let M =(date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-";
-	let D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-	let h = date.getHours() + ":";
-	let m = date.getMinutes() + ":";
-	let s = date.getSeconds();
-	return Y + M + D + h + m + s;
+	console.log("时间戳转日期--->",val)
+	if(val != 0 && val != "" && val != null && val != undefined  && val != "undefined") {
+		let date = new Date(val * 1000);
+		let Y = date.getFullYear() + "-";
+		let M =(date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-";
+		let D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
+		let h = date.getHours() + ":";
+		let m = date.getMinutes() + ":";
+		let s = date.getSeconds();
+		return Y + M + D + h + m + s;
+	}else{
+		console.log("时间戳转日期--1->",val)
+		return ""
+	}
 }
 const updateModel = (val: any) => {
 	let controlAttribute = ""