diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
index 63bdf25..bc6aaed 100644
--- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java
+++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
@@ -241,10 +241,10 @@
 
     public void updateCurrentDataScope(Long companyId, HttpSession session){
         User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER);
-        if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-        }else{
+        if(StringUtils.isEmpty(user.getDatascope())){
             user.setDatascope(companyId.toString());
+        }else if(!user.getDatascope().contains(companyId.toString())){
+            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
         }
         this.getSession().saveOrUpdate(user);
         session.setAttribute(com.casic.accessControl.util.StringUtils.SYS_USER, user);
@@ -257,10 +257,10 @@
         criteria.add(Restrictions.eq("role", amdinRole));
         List<User> users = criteria.list();
         for (User user : users) {
-            if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-            }else{
+            if(StringUtils.isEmpty(user.getDatascope())){
                 user.setDatascope(companyId.toString());
+            }else if(!user.getDatascope().contains(companyId.toString())){
+                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
             }
             this.getSession().saveOrUpdate(user);
         }

diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
index 63bdf25..bc6aaed 100644
--- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java
+++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
@@ -241,10 +241,10 @@
 
     public void updateCurrentDataScope(Long companyId, HttpSession session){
         User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER);
-        if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-        }else{
+        if(StringUtils.isEmpty(user.getDatascope())){
             user.setDatascope(companyId.toString());
+        }else if(!user.getDatascope().contains(companyId.toString())){
+            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
         }
         this.getSession().saveOrUpdate(user);
         session.setAttribute(com.casic.accessControl.util.StringUtils.SYS_USER, user);
@@ -257,10 +257,10 @@
         criteria.add(Restrictions.eq("role", amdinRole));
         List<User> users = criteria.list();
         for (User user : users) {
-            if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-            }else{
+            if(StringUtils.isEmpty(user.getDatascope())){
                 user.setDatascope(companyId.toString());
+            }else if(!user.getDatascope().contains(companyId.toString())){
+                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
             }
             this.getSession().saveOrUpdate(user);
         }
diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java
index 0bf06c1..bbbe9be 100644
--- a/src/main/java/com/casic/accessControl/user/web/UserController.java
+++ b/src/main/java/com/casic/accessControl/user/web/UserController.java
@@ -127,7 +127,12 @@
             user.setPhoneNumber(userDto.getPhoneNumber());
             user.setCompany(company);
             user.setRole(role);
-            user.setDatascope(userDto.getDatascope());
+            if(StringUtils.isNotBlank(userDto.getDatascope())){
+                user.setDatascope(userDto.getDatascope());
+            }else{
+                user.setDatascope(userDto.getCompanyId().toString());
+            }
+
             user.setIsValid(1);
             userManager.saveUser(user, session);
             if (userDto.getId() == null ) {//新增用户

diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
index 63bdf25..bc6aaed 100644
--- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java
+++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
@@ -241,10 +241,10 @@
 
     public void updateCurrentDataScope(Long companyId, HttpSession session){
         User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER);
-        if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-        }else{
+        if(StringUtils.isEmpty(user.getDatascope())){
             user.setDatascope(companyId.toString());
+        }else if(!user.getDatascope().contains(companyId.toString())){
+            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
         }
         this.getSession().saveOrUpdate(user);
         session.setAttribute(com.casic.accessControl.util.StringUtils.SYS_USER, user);
@@ -257,10 +257,10 @@
         criteria.add(Restrictions.eq("role", amdinRole));
         List<User> users = criteria.list();
         for (User user : users) {
-            if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-            }else{
+            if(StringUtils.isEmpty(user.getDatascope())){
                 user.setDatascope(companyId.toString());
+            }else if(!user.getDatascope().contains(companyId.toString())){
+                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
             }
             this.getSession().saveOrUpdate(user);
         }
diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java
index 0bf06c1..bbbe9be 100644
--- a/src/main/java/com/casic/accessControl/user/web/UserController.java
+++ b/src/main/java/com/casic/accessControl/user/web/UserController.java
@@ -127,7 +127,12 @@
             user.setPhoneNumber(userDto.getPhoneNumber());
             user.setCompany(company);
             user.setRole(role);
-            user.setDatascope(userDto.getDatascope());
+            if(StringUtils.isNotBlank(userDto.getDatascope())){
+                user.setDatascope(userDto.getDatascope());
+            }else{
+                user.setDatascope(userDto.getCompanyId().toString());
+            }
+
             user.setIsValid(1);
             userManager.saveUser(user, session);
             if (userDto.getId() == null ) {//新增用户
diff --git a/src/main/webapp/content/user/user-info-edit.jsp b/src/main/webapp/content/user/user-info-edit.jsp
index 5ee2d9e..38f2d4a 100644
--- a/src/main/webapp/content/user/user-info-edit.jsp
+++ b/src/main/webapp/content/user/user-info-edit.jsp
@@ -191,7 +191,7 @@
 
                                         <div class="controls">
 
-                                            <input type="text" id="selectCompany" name="companyName" placeholder="Select" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <input type="text" id="selectCompany" name="companyName" placeholder="选择权属单位" autocomplete="off" style="width: 447px;height: 33px"/>
 
 
                                         </div>
@@ -226,7 +226,8 @@
 
                                         <label class="control-label">数据权限</label>
                                         <div class="controls">
-                                            <input type="text" id="selectDataScope" name="dataScopeList" placeholder="Select" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <input type="text" id="selectDataScope" name="dataScopeList" placeholder="选择数据权限" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <span style="margin: 10px">不选时，默认数据权限为权属单位</span>
                                         </div>
                                     </div>
 

diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
index 63bdf25..bc6aaed 100644
--- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java
+++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
@@ -241,10 +241,10 @@
 
     public void updateCurrentDataScope(Long companyId, HttpSession session){
         User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER);
-        if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-        }else{
+        if(StringUtils.isEmpty(user.getDatascope())){
             user.setDatascope(companyId.toString());
+        }else if(!user.getDatascope().contains(companyId.toString())){
+            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
         }
         this.getSession().saveOrUpdate(user);
         session.setAttribute(com.casic.accessControl.util.StringUtils.SYS_USER, user);
@@ -257,10 +257,10 @@
         criteria.add(Restrictions.eq("role", amdinRole));
         List<User> users = criteria.list();
         for (User user : users) {
-            if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-            }else{
+            if(StringUtils.isEmpty(user.getDatascope())){
                 user.setDatascope(companyId.toString());
+            }else if(!user.getDatascope().contains(companyId.toString())){
+                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
             }
             this.getSession().saveOrUpdate(user);
         }
diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java
index 0bf06c1..bbbe9be 100644
--- a/src/main/java/com/casic/accessControl/user/web/UserController.java
+++ b/src/main/java/com/casic/accessControl/user/web/UserController.java
@@ -127,7 +127,12 @@
             user.setPhoneNumber(userDto.getPhoneNumber());
             user.setCompany(company);
             user.setRole(role);
-            user.setDatascope(userDto.getDatascope());
+            if(StringUtils.isNotBlank(userDto.getDatascope())){
+                user.setDatascope(userDto.getDatascope());
+            }else{
+                user.setDatascope(userDto.getCompanyId().toString());
+            }
+
             user.setIsValid(1);
             userManager.saveUser(user, session);
             if (userDto.getId() == null ) {//新增用户
diff --git a/src/main/webapp/content/user/user-info-edit.jsp b/src/main/webapp/content/user/user-info-edit.jsp
index 5ee2d9e..38f2d4a 100644
--- a/src/main/webapp/content/user/user-info-edit.jsp
+++ b/src/main/webapp/content/user/user-info-edit.jsp
@@ -191,7 +191,7 @@
 
                                         <div class="controls">
 
-                                            <input type="text" id="selectCompany" name="companyName" placeholder="Select" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <input type="text" id="selectCompany" name="companyName" placeholder="选择权属单位" autocomplete="off" style="width: 447px;height: 33px"/>
 
 
                                         </div>
@@ -226,7 +226,8 @@
 
                                         <label class="control-label">数据权限</label>
                                         <div class="controls">
-                                            <input type="text" id="selectDataScope" name="dataScopeList" placeholder="Select" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <input type="text" id="selectDataScope" name="dataScopeList" placeholder="选择数据权限" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <span style="margin: 10px">不选时，默认数据权限为权属单位</span>
                                         </div>
                                     </div>
 
diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js
index 3b8fafb..f1e56f1 100644
--- a/src/main/webapp/s/app/ems/ems-gd.js
+++ b/src/main/webapp/s/app/ems/ems-gd.js
@@ -54,6 +54,7 @@
     }
 
     function requestMarkers() {
+        console.log(markerData.length,hadRequest)
         if (markerData.length == 0&!hadRequest) {
             hadRequest = true;
             $.ajax({
@@ -66,6 +67,7 @@
                     if (r.data) {//请求成功，将获取到的数据加载到地图上
                         //1.解析返回的结果,.设置全局变量data的值
                         markerData = [];//清空原来的数据
+                        console.log(r.data.length)
                         for (var t = 0; t < r.data.length; t++) {
                             var markerDto = r.data[t];
                             var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle,
@@ -80,7 +82,7 @@
                         EmsGd.addMarker(markerData);
                     }
                     hadRequest = false;
-                    map.off("complete", requestMarkers());
+                    //map.off("complete", requestMarkers());
                 },
                 error: function (d) {//请求出错
                     hadRequest = false;

diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
index 63bdf25..bc6aaed 100644
--- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java
+++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java
@@ -241,10 +241,10 @@
 
     public void updateCurrentDataScope(Long companyId, HttpSession session){
         User user = (User) session.getAttribute(com.casic.accessControl.util.StringUtils.SYS_USER);
-        if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-        }else{
+        if(StringUtils.isEmpty(user.getDatascope())){
             user.setDatascope(companyId.toString());
+        }else if(!user.getDatascope().contains(companyId.toString())){
+            user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
         }
         this.getSession().saveOrUpdate(user);
         session.setAttribute(com.casic.accessControl.util.StringUtils.SYS_USER, user);
@@ -257,10 +257,10 @@
         criteria.add(Restrictions.eq("role", amdinRole));
         List<User> users = criteria.list();
         for (User user : users) {
-            if(user.getDatascope() != null && !user.getDatascope().contains(companyId.toString())){
-                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
-            }else{
+            if(StringUtils.isEmpty(user.getDatascope())){
                 user.setDatascope(companyId.toString());
+            }else if(!user.getDatascope().contains(companyId.toString())){
+                user.setDatascope((user.getDatascope().concat(",").concat(companyId.toString())));
             }
             this.getSession().saveOrUpdate(user);
         }
diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java
index 0bf06c1..bbbe9be 100644
--- a/src/main/java/com/casic/accessControl/user/web/UserController.java
+++ b/src/main/java/com/casic/accessControl/user/web/UserController.java
@@ -127,7 +127,12 @@
             user.setPhoneNumber(userDto.getPhoneNumber());
             user.setCompany(company);
             user.setRole(role);
-            user.setDatascope(userDto.getDatascope());
+            if(StringUtils.isNotBlank(userDto.getDatascope())){
+                user.setDatascope(userDto.getDatascope());
+            }else{
+                user.setDatascope(userDto.getCompanyId().toString());
+            }
+
             user.setIsValid(1);
             userManager.saveUser(user, session);
             if (userDto.getId() == null ) {//新增用户
diff --git a/src/main/webapp/content/user/user-info-edit.jsp b/src/main/webapp/content/user/user-info-edit.jsp
index 5ee2d9e..38f2d4a 100644
--- a/src/main/webapp/content/user/user-info-edit.jsp
+++ b/src/main/webapp/content/user/user-info-edit.jsp
@@ -191,7 +191,7 @@
 
                                         <div class="controls">
 
-                                            <input type="text" id="selectCompany" name="companyName" placeholder="Select" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <input type="text" id="selectCompany" name="companyName" placeholder="选择权属单位" autocomplete="off" style="width: 447px;height: 33px"/>
 
 
                                         </div>
@@ -226,7 +226,8 @@
 
                                         <label class="control-label">数据权限</label>
                                         <div class="controls">
-                                            <input type="text" id="selectDataScope" name="dataScopeList" placeholder="Select" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <input type="text" id="selectDataScope" name="dataScopeList" placeholder="选择数据权限" autocomplete="off" style="width: 447px;height: 33px"/>
+                                            <span style="margin: 10px">不选时，默认数据权限为权属单位</span>
                                         </div>
                                     </div>
 
diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js
index 3b8fafb..f1e56f1 100644
--- a/src/main/webapp/s/app/ems/ems-gd.js
+++ b/src/main/webapp/s/app/ems/ems-gd.js
@@ -54,6 +54,7 @@
     }
 
     function requestMarkers() {
+        console.log(markerData.length,hadRequest)
         if (markerData.length == 0&!hadRequest) {
             hadRequest = true;
             $.ajax({
@@ -66,6 +67,7 @@
                     if (r.data) {//请求成功，将获取到的数据加载到地图上
                         //1.解析返回的结果,.设置全局变量data的值
                         markerData = [];//清空原来的数据
+                        console.log(r.data.length)
                         for (var t = 0; t < r.data.length; t++) {
                             var markerDto = r.data[t];
                             var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle,
@@ -80,7 +82,7 @@
                         EmsGd.addMarker(markerData);
                     }
                     hadRequest = false;
-                    map.off("complete", requestMarkers());
+                    //map.off("complete", requestMarkers());
                 },
                 error: function (d) {//请求出错
                     hadRequest = false;
diff --git a/src/main/webapp/s/combo-tree/css/style.css b/src/main/webapp/s/combo-tree/css/style.css
index 6eafb9f..9e0049e 100644
--- a/src/main/webapp/s/combo-tree/css/style.css
+++ b/src/main/webapp/s/combo-tree/css/style.css
@@ -23,6 +23,7 @@
 .comboTreeWrapper{
 	position: relative;
 	text-align: left !important;
+    display: inline-block;
 }
 
 .comboTreeInputWrapper{