Merge branch 'master' of http://git.12345lm.cn/Fengwo/data-transfer

App.config

@@ -4,11 +4,14 @@
     <!--<add key ="SQLServerDB" value="server=10.10.110.195;database=CityHotline_Web;uid=CityHotlineUser_V3;pwd=F123456aA;"/>
     <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline;"/>-->
     <!--宜宾-->
-    <add key ="SQLServerDB" value="server=172.15.28.10,4666;database=CityHotline_Web;uid=CityHotlineUser;pwd=yb12345#@!;"/>
-    <add key ="PGSQLDB" value="Server=100.122.1.9;Port=5432;UserId=fwkjyibin;Password=Fwkj2023##!!**;Database=hotline;"/>
+    <!--<add key ="SQLServerDB" value="server=172.15.28.10,4666;database=CityHotline_Web;uid=CityHotlineUser;pwd=yb12345#@!;"/>
+    <add key ="PGSQLDB" value="Server=100.122.1.9;Port=5432;UserId=fwkjyibin;Password=Fwkj2023##!!**;Database=hotline;"/>-->
     <!--自贡-->
     <!--<add key ="SQLServerDB" value="server=61.157.186.3,4368;database=ZG_CityHotline_Ver3;uid=ZGCityHotlineUser;pwd=fway09!@ZG_15;"/>
     <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_zg;"/>-->
+    <!--泸州-->
+    <add key ="SQLServerDB" value="server=172.20.200.11,4433;database=CityHotline_Ver3;uid=HotlineUser_Ver3;pwd=lzs12345aA!@#;"/>
+    <add key ="PGSQLDB" value="Server=110.188.24.182;Port=5432;UserId=dev;Password=fengwo11!!;Database=hotline_lz;"/>
     <add key ="LogLevel" value="10"/>
   </appSettings>
 </configuration>

Form1.cs

@@ -40,9 +40,9 @@ namespace DataTransmission
             }
             if (cb_user.Checked)
             {
-                execute.ExecuteUserSql();
+                //execute.ExecuteUserSql();
                 //工号
-                //execute.ExecuteStaffSql();
+                execute.ExecuteStaffSql();
             }
             MessageBox.Show("同步完成！请先别关闭程序！");
             btn_tb.Enabled = true;

Joint/Knowledge.cs

@@ -19,7 +19,7 @@ namespace DataTransmission.Joint
 			var conn = tool.GetConSqlServer();
 			var sql = $@"SELECT HR.*,HC.* FROM  dbo.SYS22_HelpRecord  HR 
 							LEFT JOIN  dbo.SYS23_HelpContent HC ON HR.SHR_ID =HC.SHC_SRID
-							WHERE HR.SHR_Date >= '{st_time}' AND HR.SHR_Date <= '{end_time}' AND SHR_AuditFlag =2 AND HR.SHR_DelFlag = 0 ";
+							WHERE  SHR_AuditFlag =2 AND HR.SHR_DelFlag = 0 ";
 			//HR.SHR_Date >= '{st_time}' AND HR.SHR_Date <= '{end_time}' AND
 			return tool.GetDataTable(sql, conn);
 		}

Joint/User.cs

@@ -36,7 +36,7 @@ namespace DataTransmission.Joint
 						continue;
 					}
 					insertSql += $@"INSERT INTO ""public"".""user"" (""Id"",""Name"",""Gender"",""IsDeleted"",""CreationTime"",""CreatorOrgLevel"",""UserType"",""OldUserId"",""OrgId"",""PhoneNo""
-									)VALUES('{id}','{row["SUser_Name"]}',2,'f','2024-04-19 00:00:00.000000',1,0,{row["SUser_ID"]},{row["SUser_BMID"]},'{row["SInfo_Mobile"]}');";
+									)VALUES('{id}','{row["SUser_Name"]}',2,'f','2024-04-19 00:00:00.000000',1,0,{row["SUser_ID"]},{row["SUser_BMID"]},'{row["SInfo_Mobile"].ToString().Trim()}');";
 					insertSql += GetUserAccountSql(row,id);
 				}
 			}