diff --git a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
index 862224e..39d45e4 100644
--- a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
+++ b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
@@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectProProjectInfoVo">
-        select id, name, dept_id, address, infos, person_name, person_phone, main_image, images, proj_status, is_del, create_by, create_time, update_by, update_time, remark, unit from pro_project_info
+        select id, name, dept_id, address, infos, person_name, person_phone, main_image, images, proj_status, is_del, create_by, create_time, update_by, update_time, remark, unit
+        from pro_project_info
     </sql>
 
     <select id="selectProProjectInfoList" parameterType="ProProjectInfo" resultMap="ProProjectInfoResult">
diff --git a/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml b/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 75da5e9..3132bdd 100644
--- a/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
 		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
+			AND dept_id = #{deptId} or find_in_set(#{deptId}, ancestors)
 		</if>
         <if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
diff --git a/yanzhu-ui/public/favicon.ico b/yanzhu-ui/public/favicon.ico
deleted file mode 100644
index e263760..0000000
Binary files a/yanzhu-ui/public/favicon.ico and /dev/null differ
diff --git a/yanzhu-ui/public/favicon.svg b/yanzhu-ui/public/favicon.svg
new file mode 100644
index 0000000..c3ce3e8
--- /dev/null
+++ b/yanzhu-ui/public/favicon.svg
@@ -0,0 +1 @@
+<svg class="icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="732"><path d="M78.697006 291.684329L464.648823 120.095559a101.13599 101.13599 0 0 1 82.151644 0l385.951817 171.58877a50.567995 50.567995 0 0 1-0.044696 92.387077L546.75577 555.660176a101.13599 101.13599 0 0 1-82.151643 0L78.65231 384.071406A50.567995 50.567995 0 0 1 78.697006 291.684329z" fill="#0594E6" p-id="733"></path><path d="M354.392471 319.348336l133.641683-59.445966a30.214377 30.214377 0 0 1 24.582918 0l133.641683 59.445966a15.107188 15.107188 0 0 1 0.044697 27.577564l-133.641684 59.445967a30.214377 30.214377 0 0 1-24.627614-0.044697l-133.641683-59.445966a15.107188 15.107188 0 0 1 0-27.532868z" fill="#FFFFFF" p-id="734"></path><path d="M884.93991 472.808856l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.41301L546.766445 758.075557a101.13599 101.13599 0 0 1-82.172992 0L78.633232 586.460424a50.567995 50.567995 0 0 1 0-92.41301L126.419987 472.808856 464.593453 623.122221a101.13599 101.13599 0 0 0 72.185813 3.792599l9.987179-3.792599L884.93991 472.808856z" fill="#0594E6" p-id="735"></path><path d="M884.93991 675.144045l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.413011L546.766445 960.347536a101.13599 101.13599 0 0 1-82.172992 0L78.633232 788.858824a50.567995 50.567995 0 0 1 0-92.413011L126.419987 675.080835 464.593453 825.52062a101.13599 101.13599 0 0 0 72.185813 3.7926l9.987179-3.7926L884.93991 675.144045z" fill="#FA8F31" p-id="736"></path></svg>
\ No newline at end of file
diff --git a/yanzhu-ui/public/index.html b/yanzhu-ui/public/index.html
index 7ab8641..0e689a1 100644
--- a/yanzhu-ui/public/index.html
+++ b/yanzhu-ui/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.svg">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
diff --git a/yanzhu-ui/public/preview.html b/yanzhu-ui/public/preview.html
index a20510b..ca08e33 100644
--- a/yanzhu-ui/public/preview.html
+++ b/yanzhu-ui/public/preview.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="icon" href="<%= BASE_URL %>favicon.svg">
   <title>form-generator-preview</title>
   <link href="https://lib.baomitu.com/element-ui/2.13.2/theme-chalk/index.css" rel="stylesheet">
   <script src="https://lib.baomitu.com/vue/2.6.11/vue.min.js"></script>
diff --git a/yanzhu-ui/src/api/system/user.js b/yanzhu-ui/src/api/system/user.js
index ad5e09c..a206703 100644
--- a/yanzhu-ui/src/api/system/user.js
+++ b/yanzhu-ui/src/api/system/user.js
@@ -127,9 +127,9 @@ export function updateAuthRole(data) {
 }
 
 // 查询部门下拉树结构
-export function deptTreeSelect() {
+export function deptTreeSelect(deptId) {
   return request({
-    url: '/system/user/deptTree',
+    url: '/system/user/deptTree?deptId='+deptId,
     method: 'get'
   })
 }
diff --git a/yanzhu-ui/src/assets/images/profile.jpg b/yanzhu-ui/src/assets/images/profile.jpg
index b3a940b..c5039f0 100644
Binary files a/yanzhu-ui/src/assets/images/profile.jpg and b/yanzhu-ui/src/assets/images/profile.jpg differ
diff --git a/yanzhu-ui/src/assets/logo/logo.svg b/yanzhu-ui/src/assets/logo/logo.svg
new file mode 100644
index 0000000..c3ce3e8
--- /dev/null
+++ b/yanzhu-ui/src/assets/logo/logo.svg
@@ -0,0 +1 @@
+<svg class="icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="732"><path d="M78.697006 291.684329L464.648823 120.095559a101.13599 101.13599 0 0 1 82.151644 0l385.951817 171.58877a50.567995 50.567995 0 0 1-0.044696 92.387077L546.75577 555.660176a101.13599 101.13599 0 0 1-82.151643 0L78.65231 384.071406A50.567995 50.567995 0 0 1 78.697006 291.684329z" fill="#0594E6" p-id="733"></path><path d="M354.392471 319.348336l133.641683-59.445966a30.214377 30.214377 0 0 1 24.582918 0l133.641683 59.445966a15.107188 15.107188 0 0 1 0.044697 27.577564l-133.641684 59.445967a30.214377 30.214377 0 0 1-24.627614-0.044697l-133.641683-59.445966a15.107188 15.107188 0 0 1 0-27.532868z" fill="#FFFFFF" p-id="734"></path><path d="M884.93991 472.808856l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.41301L546.766445 758.075557a101.13599 101.13599 0 0 1-82.172992 0L78.633232 586.460424a50.567995 50.567995 0 0 1 0-92.41301L126.419987 472.808856 464.593453 623.122221a101.13599 101.13599 0 0 0 72.185813 3.792599l9.987179-3.792599L884.93991 472.808856z" fill="#0594E6" p-id="735"></path><path d="M884.93991 675.144045l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.413011L546.766445 960.347536a101.13599 101.13599 0 0 1-82.172992 0L78.633232 788.858824a50.567995 50.567995 0 0 1 0-92.413011L126.419987 675.080835 464.593453 825.52062a101.13599 101.13599 0 0 0 72.185813 3.7926l9.987179-3.7926L884.93991 675.144045z" fill="#FA8F31" p-id="736"></path></svg>
\ No newline at end of file
diff --git a/yanzhu-ui/src/layout/components/Navbar.vue b/yanzhu-ui/src/layout/components/Navbar.vue
index 7d16324..7a41ec2 100644
--- a/yanzhu-ui/src/layout/components/Navbar.vue
+++ b/yanzhu-ui/src/layout/components/Navbar.vue
@@ -178,9 +178,11 @@ export default {
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
-          height: 40px;
-          border-radius: 10px;
+          width: 30px;
+          height: 30px;
+          border-radius: 15px;
+          position: relative;
+          top: 5px;
         }
 
         .el-icon-caret-bottom {
diff --git a/yanzhu-ui/src/layout/components/Sidebar/Logo.vue b/yanzhu-ui/src/layout/components/Sidebar/Logo.vue
index 2774cc8..b17f37f 100644
--- a/yanzhu-ui/src/layout/components/Sidebar/Logo.vue
+++ b/yanzhu-ui/src/layout/components/Sidebar/Logo.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/logo/logo.svg'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
diff --git a/yanzhu-ui/src/views/project/company/index.vue b/yanzhu-ui/src/views/project/company/index.vue
index bf7675d..974d4f0 100644
--- a/yanzhu-ui/src/views/project/company/index.vue
+++ b/yanzhu-ui/src/views/project/company/index.vue
@@ -189,6 +189,7 @@ export default {
                 orderNum: 100,
                 leader: undefined,
                 phone: undefined,
+                level:1,
                 email: '',
                 status: "0"
             };
@@ -234,6 +235,7 @@ export default {
         submitForm: function () {
             this.$refs["form"].validate(valid => {
                 if (valid) {
+                    this.form.level=1
                     if (this.form.deptId != undefined) {
                         updateDept(this.form).then(response => {
                             this.$modal.msgSuccess("修改成功");
diff --git a/yanzhu-ui/src/views/system/user/index.vue b/yanzhu-ui/src/views/system/user/index.vue
index 9aea1a0..831eb17 100644
--- a/yanzhu-ui/src/views/system/user/index.vue
+++ b/yanzhu-ui/src/views/system/user/index.vue
@@ -331,7 +331,7 @@ export default {
       this.$refs.tree.filter(val);
     }
   },
-  created() {
+  created() {    
     this.getList();
     this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
@@ -368,6 +368,9 @@ export default {
     /** 查询用户列表 */
     getList() {
       this.loading = true;
+      if(!this.queryParams.deptId){
+        this.queryParams.deptId = this.$store.state.user.dept.deptId;
+      }
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.userList = response.rows;
         this.total = response.total;
@@ -376,8 +379,8 @@ export default {
       );
     },
     /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {        
+    getDeptTree() {      
+      deptTreeSelect(this.$store.state.user.dept.deptId).then(response => {        
         this.deptOptions = response.data;
       });
     },
diff --git a/yanzhu-ui/src/views/tool/build/index.vue b/yanzhu-ui/src/views/tool/build/index.vue
index 8affeb0..1dbc07a 100644
--- a/yanzhu-ui/src/views/tool/build/index.vue
+++ b/yanzhu-ui/src/views/tool/build/index.vue
@@ -157,7 +157,7 @@ import {
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefault from '@/utils/generator/drawingDefalut'
-import logo from '@/assets/logo/logo.png'
+import logo from '@/assets/logo/logo.svg'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'
 import {
diff --git a/yanzhu-ui/vue.config.js b/yanzhu-ui/vue.config.js
index 8a49fb7..fc4521a 100644
--- a/yanzhu-ui/vue.config.js
+++ b/yanzhu-ui/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080${process.env.VUE_APP_BASE_API}`,
-        //target: `http://49.235.181.228${process.env.VUE_APP_BASE_API}`,
+        //target: `http://localhost:8080${process.env.VUE_APP_BASE_API}`,
+        target: `http://62.234.3.186${process.env.VUE_APP_BASE_API}`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''