diff --git a/pom.xml b/pom.xml
index 292b3143bc29e1c09feac3c22d8187cf729fd8fc..9c83adf16209f5b3f5f9cf9653d693aed44441a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <scope>5.1.34</scope>
+            <version>5.1.34</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -254,7 +254,7 @@ mvn install:install-file -Dfile=E:\work\GITCODE\dh_data_mng_2\src\main\resources
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
+            <version>13.0</version>
             <scope>compile</scope>
         </dependency>
 
@@ -303,13 +303,13 @@ mvn install:install-file -Dfile=E:\work\GITCODE\dh_data_mng_2\src\main\resources
                 </configuration>
             </plugin>
 
-            <plugin>
+            <!--<plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <fork>true</fork><!-- 如果没有该配置，热部署的devtools不生效 -->
+                    <fork>true</fork>&lt;!&ndash; 如果没有该配置，热部署的devtools不生效 &ndash;&gt;
                 </configuration>
-            </plugin>
+            </plugin>-->
 
             <plugin>
                 <groupId>org.mybatis.generator</groupId>
diff --git a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java
index 46be14466e0c7404b96fb9a6eecc62b3fb2a955b..7f3491cee18d9c8f0a6ddf715156dee1e02faec4 100644
--- a/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java
+++ b/src/main/java/com/cetc32/dh/beans/ResultUserInfo.java
@@ -176,7 +176,7 @@ public class ResultUserInfo extends NumberS {
 
     public void setDepartment(Object department)
     {
-        if(department ==null)
+        if(this.department ==null)
         {
             this.department = new ArrayList<>();
             return;
@@ -185,15 +185,21 @@ public class ResultUserInfo extends NumberS {
         {
             if(((String)department).isEmpty())
             {
-                this.department = new ArrayList<>();
+                //this.department = new ArrayList<>();
                 return;
             }
  //           String s=trimBothEndsChars((String) department,",");
             this.department=str2intList((String) department);
         }
+        if(department instanceof Integer){
+            if(!this.department.contains((Integer)department))
+             this.department.add((Integer)department);
+        }
         if(department instanceof List || department instanceof ArrayList)
         {
-            this.department=(List<Integer>) department;
+           for(Integer i : (List<Integer>) department){
+               setDepartment(i);
+           }
         }
     }
 
diff --git a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
index 9945eaa8c3944bb3d0fca13892e6452f8979be42..8f6b21781bfad2593f52b90346a44c1325f9fc4f 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/AuthController.java
@@ -15,10 +15,12 @@ import com.cetc32.dh.common.response.ResponseData;
 import com.cetc32.dh.common.utils.Tools;
 import com.cetc32.dh.entity.AreaCommon;
 import com.cetc32.dh.entity.BaseAdminUser;
+import com.cetc32.dh.entity.Department;
 import com.cetc32.dh.listener.ContainerStartedListener;
 import com.cetc32.dh.service.AdminRoleService;
 import com.cetc32.dh.service.AdminUserService;
 import com.cetc32.dh.service.AreaCommonService;
+import com.cetc32.dh.service.DepartmentService;
 import com.cetc32.webutil.common.annotations.LoginRequired;
 import com.cetc32.webutil.common.annotations.LoginSkipped;
 import com.cetc32.webutil.common.util.CookieUtil;
@@ -66,6 +68,8 @@ public class AuthController {
     Long tokenAge=7200000L;
     @Value("${sso.syscode}")
     String sysCode;
+    @Value("${departmentRoot}")
+    Integer departmentRoot;
 
     @Autowired
     AdminUserService userService;
@@ -76,6 +80,9 @@ public class AuthController {
     @Autowired
     AdminRoleService adminRoleService;
 
+    @Autowired
+    DepartmentService departmentService;
+
     /**
      * web用户登陆
      * @Description 用户登陆接口，登陆过程中需要更新用户的登陆时间，loginFailed次数等
@@ -670,6 +677,24 @@ public class AuthController {
                                 data.getPermissions().add(basePermission);
                             }
                         }
+                        if(null!=data.getDepartment() && data.getDepartment().size()>0){
+                            List<Integer> depIds = data.getDepartment();
+                            Integer id=depIds.get(0);
+                            if(depIds.size()>1){
+                                for(Integer i :depIds){
+                                    if(id>i&& i>departmentRoot)
+                                        id=i;
+                                }
+                            }
+                            Department dept=null;
+                            do{
+                                dept =departmentService.findByID(id);
+                                id=dept.getOrganizationid();
+                            }while(id!= departmentRoot);
+                            if(null != dept){
+                                data.setDepartment(dept.getId());
+                            }
+                        }
                         return ResponseData.success(data);
                     }
                     else
diff --git a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java
index a9def5af7c8011d3a4dacefacc2f6e78e18cae05..ba126c045610962eb107312ac9f9d881e522f9b2 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/DepartmentController.java
@@ -90,18 +90,36 @@ public class DepartmentController{
             return ResponseData.error("上级部门不存在！");
         }
         department.setName(department.getName().trim());
+        if (checkDepartment(department)) return ResponseData.error("同级已存在重复名字！");
+        if(departmentService.insert(department)>0){
+            return  ResponseData.success("新增成功！");
+        }
+        return ResponseData.error("新增失败");
+    }
+
+    private boolean checkDepartment(@RequestBody Department department) {
         List<Department> dp=departmentService.findByParentID(department.getOrganizationid());
         List<Department> result1 = dp.stream()
                 .filter(item -> item.getName().equals(department.getName()))
                 .collect(Collectors.toList());
         if(result1.size()>0)
         {
-            return ResponseData.error("同级已存在重复名字！");
+            return true;
         }
-        if(departmentService.insert(department)>0){
-            return  ResponseData.success("新增成功！");
+        return false;
+    }
+
+    @GetMapping("/children")
+    public ResponseData findDepartmentByParent(Integer parentId){
+        if(parentId==null || parentId==0){
+            parentId=1;
         }
-        return ResponseData.error("新增失败");
+        try{
+         return ResponseData.success(departmentService.findByParentID(parentId));
+        }catch(Exception e){
+            e.printStackTrace();
+        }
+        return ResponseData.error("数据库操作异常");
     }
 
     @ApiOperation(value = "删除部门")
@@ -144,14 +162,7 @@ public class DepartmentController{
         }
         Department department_base= departmentService.findByID(department.getId());
         department_base.setName(department.getName());
-      List<Department> dp=departmentService.findByParentID( department_base.getOrganizationid());
-      List<Department> result1 = dp.stream()
-        .filter(item -> item.getName().equals( department_base.getName()))
-        .collect(Collectors.toList());
-      if(result1.size()>0)
-      {
-        return ResponseData.error("同级已存在重复名字！");
-      }
+        if (checkDepartment(department_base)) return ResponseData.error("同级已存在重复名字！");
         departmentService.updateByPrimaryKeySelective( department_base);
         return new ResponseData("更新成功");
     }
diff --git a/src/main/resources/application-xwy.yml b/src/main/resources/application-xwy.yml
index efc4f60e626fda1cb55fdd6e6cacfd32102599f2..2f692821d772c7d5c04f6aeec15f4e5e4d05bfaa 100644
--- a/src/main/resources/application-xwy.yml
+++ b/src/main/resources/application-xwy.yml
@@ -7,11 +7,11 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:postgresql://180.184.65.203:5432/dhmanage
-    #url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    #url: jdbc:postgresql://180.184.65.203:5432/dhmanage
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
     username: postgres
-    #password: 123456
-    password: Zdk@824.
+    password: 123456
+    #password: Zdk@824.
     driver-class-name: org.postgresql.Driver
 
 #  datasource:
@@ -59,6 +59,7 @@ rootPath: /root/daohang/data
 myPath: ${rootPath}myPath
 writePath: ${rootPath}/product
 eip: http://192.168.1.209:8080/
+startCode: 000000
 #verifyUrl: ${sso.authcenter}/rest/auth/verify?token=
 #passportUrl: ${sso.authcenter}/?ReturnUrl=
 #defaultLoginRequiredEnable: false
@@ -73,3 +74,6 @@ sso:
   registerUrl : ${sso.authcenter}/rest/api/sys/sync
   #loginInclude: /rest/auth/**,/rest/role/**,/rest/audit/**
   syscode: S000
+  basePermission: S000接口用户
+  #单位是毫秒
+  tokeAge: 3600000
diff --git a/src/main/resources/application-xwybjb.yml b/src/main/resources/application-xwybjb.yml
index 56e8fea5beff695265ceeeda62a61a652e6bda69..3a517225e2423825bebdfb28f3ff9e084ce9263b 100644
--- a/src/main/resources/application-xwybjb.yml
+++ b/src/main/resources/application-xwybjb.yml
@@ -7,8 +7,8 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:postgresql://localhost:5432/dhmanage
-    #url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    #url: jdbc:postgresql://localhost:5432/dhmanage
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
     username: postgres
     password: 123456
     #password: Zdk@824.
@@ -77,3 +77,4 @@ sso:
   basePermission: S000接口用户
   #单位是毫秒
   tokeAge : 3600000
+departmentRoot: 1
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 1504a6dc88f3d8e8d4cd29e7c01c28a195bb8c4a..f5581c38b4ef0c2568c7ea3ca4b11280a9f70830 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -6,6 +6,31 @@
 		<script src="/js/jquery-3.1.1.min.js" type="text/javascript" charset="utf-8"></script>
 		<title>登录</title>
 	</head>
+	<script type="text/javascript">
+		window.onload = function () {
+			var count=0;
+			let timer=setInterval(()=>{
+				console.log("postMessage")
+				window.parent.postMessage('login','*');
+				//window.top.document.location.reload();
+				count++
+				if(count>=10){
+					clearInterval(timer)
+					console.log("count:"+count)
+				}
+
+				console.log("postMessage end")
+				//window.parent.document.location.reload();
+			},1000)
+			console.log(location.href);
+			console.log(window.top.location.href)
+			/*console.log(parent.location.href)
+			console.log(window.location.href)
+			if(parent != window){
+				parent.location.href = location.href
+			}*/
+		}
+	</script>
 	<body>
 		<!--顶部logo-->