diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs
index c242b82..955bf70 100644
--- a/DoublePanelAnalysis.cs
+++ b/DoublePanelAnalysis.cs
@@ -336,7 +336,7 @@
                     GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2;
                     double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1,
                         out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false);
-                    GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D;
+                    GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; 
                     if (pipeStyle2 == null) continue;
                     result.Add(feat2,dDist);
                 }
@@ -379,6 +379,8 @@
                     GSOPoint3d pntIntersect1, pntIntersect2;
                     double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1,
                         out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio);
+//                    dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius;
+                    dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius;
                     if (dDist <= 0)
                     {
                        FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo();

diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs
index c242b82..955bf70 100644
--- a/DoublePanelAnalysis.cs
+++ b/DoublePanelAnalysis.cs
@@ -336,7 +336,7 @@
                     GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2;
                     double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1,
                         out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false);
-                    GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D;
+                    GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; 
                     if (pipeStyle2 == null) continue;
                     result.Add(feat2,dDist);
                 }
@@ -379,6 +379,8 @@
                     GSOPoint3d pntIntersect1, pntIntersect2;
                     double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1,
                         out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio);
+//                    dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius;
+                    dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius;
                     if (dDist <= 0)
                     {
                        FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo();
diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs
index 670d0f7..b802788 100644
--- a/FrmPatrolerManager.cs
+++ b/FrmPatrolerManager.cs
@@ -177,15 +177,15 @@
 
         private void initForm()
         {
-            if (!Utility.userRole.Equals("巡检员新增"))
+            if (!Utility.userRole.Contains("巡检员新增"))
             {
                 btn_add_person.Visible = false;
             }
-            if (!Utility.userRole.Equals("巡检员编辑"))
+            if (!Utility.userRole.Contains("巡检员编辑"))
             {
                 编辑ToolStripMenuItem.Visible = false;
             }
-            if (!Utility.userRole.Equals("巡检员注销"))
+            if (!Utility.userRole.Contains("巡检员注销"))
             {
                 注销ToolStripMenuItem.Visible = false;
             }

diff --git a/DoublePanelAnalysis.cs b/DoublePanelAnalysis.cs
index c242b82..955bf70 100644
--- a/DoublePanelAnalysis.cs
+++ b/DoublePanelAnalysis.cs
@@ -336,7 +336,7 @@
                     GSOPoint3d pntIntersect1, pntIntersect2, pntProIntersect1, pntProIntersect2;
                     double dDist = globeControl.Globe.Analysis3D.ComputeHorizonDistance(line1, line2, out pntIntersect1,
                         out pntIntersect2, out pntProIntersect1, out pntProIntersect2, false);
-                    GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D;
+                    GSOPipeLineStyle3D pipeStyle2 = line2.Style as GSOPipeLineStyle3D; 
                     if (pipeStyle2 == null) continue;
                     result.Add(feat2,dDist);
                 }
@@ -379,6 +379,8 @@
                     GSOPoint3d pntIntersect1, pntIntersect2;
                     double dDist = globeControl.Globe.Analysis3D.ComputeTwoGeoPolylineDistance(line1, line2, out pntIntersect1,
                         out pntIntersect2,out horLen,out verLen,true,true,dNoIntersetStartRatio);
+//                    dDist = Math.Abs(pntIntersect1.Z - pntIntersect2.Z) - pipeStyle1.Radius - pipeStyle2.Radius;
+                    dDist = dDist - pipeStyle1.Radius - pipeStyle2.Radius;
                     if (dDist <= 0)
                     {
                        FeatureAnalysisInfo featureAnalysisInfo = new FeatureAnalysisInfo();
diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs
index 670d0f7..b802788 100644
--- a/FrmPatrolerManager.cs
+++ b/FrmPatrolerManager.cs
@@ -177,15 +177,15 @@
 
         private void initForm()
         {
-            if (!Utility.userRole.Equals("巡检员新增"))
+            if (!Utility.userRole.Contains("巡检员新增"))
             {
                 btn_add_person.Visible = false;
             }
-            if (!Utility.userRole.Equals("巡检员编辑"))
+            if (!Utility.userRole.Contains("巡检员编辑"))
             {
                 编辑ToolStripMenuItem.Visible = false;
             }
-            if (!Utility.userRole.Equals("巡检员注销"))
+            if (!Utility.userRole.Contains("巡检员注销"))
             {
                 注销ToolStripMenuItem.Visible = false;
             }
diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt
index cd82eca..755455e 100644
--- a/bin/x86/Debug/glVersion.txt
+++ b/bin/x86/Debug/glVersion.txt
Binary files differ