diff --git a/sgzb-auth/src/main/resources/bootstrap.yml b/sgzb-auth/src/main/resources/bootstrap.yml
index e8b1c5d3..31bcd472 100644
--- a/sgzb-auth/src/main/resources/bootstrap.yml
+++ b/sgzb-auth/src/main/resources/bootstrap.yml
@@ -2,6 +2,13 @@
 server: 
   port: 29200
 
+
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+  endpoint:
+    env:
+      enabled: false
+
 # Spring
 spring: 
   application:
@@ -14,11 +21,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
         # 配置文件格式
         file-extension: yml
diff --git a/sgzb-gateway/src/main/resources/bootstrap.yml b/sgzb-gateway/src/main/resources/bootstrap.yml
index 2968520f..629b65fd 100644
--- a/sgzb-gateway/src/main/resources/bootstrap.yml
+++ b/sgzb-gateway/src/main/resources/bootstrap.yml
@@ -27,11 +27,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
         # 配置文件格式
         file-extension: yml
diff --git a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
index e778cf56..df57a0d3 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-base/src/main/resources/bootstrap.yml
@@ -2,6 +2,13 @@
 server:
   port: 29301
 
+
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+  endpoint:
+    env:
+      enabled: false
+
 # Spring
 spring: 
   application:
@@ -21,11 +28,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
         # 配置文件格式
         file-extension: yml
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 642967da..dd7cb7a1 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -480,7 +480,7 @@
 
   <select id="getAuditListByLeaseTmTask" resultType="com.bonus.sgzb.app.domain.TmTask">
       SELECT DISTINCT
-      tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
+      tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName,
       bpl.lot_id as proId,bpl.lot_name as proName,
       bui.unit_id as unitId,bui.unit_name as unitName,
       lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,d.`name` as taskName,lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
index 7460ffaa..e966e19c 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
@@ -226,7 +226,7 @@ public class BackApplyServiceImpl implements BackApplyService {
         Long companyId = null;
         try {
             roles = SecurityUtils.getLoginUser().getRoles();
-            userid = SecurityUtils.getLoginUser().getUserid();
+            userid = SecurityUtils.getLoginUser().getSysUser().getUserId();
             companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
         } catch (NullPointerException e) {
             e.printStackTrace();
@@ -249,10 +249,8 @@ public class BackApplyServiceImpl implements BackApplyService {
                         return AjaxResult.error("审核失败");
                     }
                 }
-                if ((roles != null && roles.contains("jjfgs")) || (companyId != null && companyId.equals(101L))) {
-                    if (companyId != null) {
-                        bean.setCompanyId(companyId.toString());
-                    }
+                if (companyId != null && companyId.equals(101L)) {
+                    bean.setCompanyId(companyId.toString());
                     if (userid != null) {
                         bean.setCreateBy(userid.toString());
                     }
@@ -262,10 +260,8 @@ public class BackApplyServiceImpl implements BackApplyService {
                         return AjaxResult.error("审核失败");
                     }
                 }
-                if ((roles != null && roles.contains("tsfgs")) || (companyId != null && companyId.equals(102L))) {
-                    if (companyId != null) {
-                        bean.setCompanyId(companyId.toString());
-                    }
+                if (companyId != null && companyId.equals(102L)) {
+                    bean.setCompanyId(companyId.toString());
                     if (userid != null) {
                         bean.setCreateBy(userid.toString());
                     }
@@ -320,7 +316,7 @@ public class BackApplyServiceImpl implements BackApplyService {
                 for (int i = 0; i < ids.length; i++) {
                     String id = ids[i];
                     bean.setId(Long.valueOf(id));
-                    if (userId == 1) {
+                    if (roles.contains("admin")) {
                         bean.setCreateBy(userId.toString());
                         bean.setStatus("2");
                         int re = backApplyMapper.refuse(bean);
@@ -328,7 +324,7 @@ public class BackApplyServiceImpl implements BackApplyService {
                             return AjaxResult.error("驳回失败");
                         }
                     }
-                    if (roles.contains("jjfgs")) {
+                    if (companyId != null && companyId.equals(101L)) {
                         bean.setCompanyId(companyId.toString());
                         bean.setCreateBy(userId.toString());
                         bean.setStatus("2");
@@ -337,7 +333,7 @@ public class BackApplyServiceImpl implements BackApplyService {
                             return AjaxResult.error("驳回失败");
                         }
                     }
-                    if (roles.contains("tsfgs")) {
+                    if (companyId != null && companyId.equals(102L)) {
                         bean.setCompanyId(companyId.toString());
                         bean.setCreateBy(userId.toString());
                         bean.setStatus("4");
@@ -426,7 +422,7 @@ public class BackApplyServiceImpl implements BackApplyService {
         Long companyId = null;
         try {
             roles = SecurityUtils.getLoginUser().getRoles();
-            userid = SecurityUtils.getLoginUser().getUserid();
+            userid = SecurityUtils.getLoginUser().getSysUser().getUserId();
             companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
         } catch (NullPointerException e) {
             e.printStackTrace();
@@ -447,10 +443,8 @@ public class BackApplyServiceImpl implements BackApplyService {
                         return AjaxResult.error("审核失败");
                     }
                 }
-                if (roles != null && roles.contains("jjfgs")) {
-                    if (companyId != null) {
-                        dto.setCompanyId(companyId.toString());
-                    }
+                if (companyId != null && companyId.equals(101L)) {
+                    dto.setCompanyId(companyId.toString());
                     if (userid != null) {
                         dto.setCreateBy(userid.toString());
                     }
@@ -460,10 +454,8 @@ public class BackApplyServiceImpl implements BackApplyService {
                         return AjaxResult.error("审核失败");
                     }
                 }
-                if (roles != null && roles.contains("tsfgs")) {
-                    if (companyId != null) {
-                        dto.setCompanyId(companyId.toString());
-                    }
+                if (companyId != null && companyId.equals(102L)) {
+                    dto.setCompanyId(companyId.toString());
                     if (userid != null) {
                         dto.setCreateBy(userid.toString());
                     }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
index 5e400e16..0f0e9e4d 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-material/src/main/resources/bootstrap.yml
@@ -2,6 +2,12 @@
 server:
   port: 29302
 
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+  endpoint:
+    env:
+      enabled: false
+
 # Spring
 spring: 
   application:
@@ -21,11 +27,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
         # 配置文件格式
         file-extension: yml
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysOperlogController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysOperlogController.java
index e6036f17..4762b5c5 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysOperlogController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysOperlogController.java
@@ -27,7 +27,7 @@ import com.bonus.sgzb.system.service.ISysOperLogService;
 
 /**
  * 操作日志记录
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -39,8 +39,7 @@ public class SysOperlogController extends BaseController {
 
     @RequiresPermissions("system:operlog:list")
     @GetMapping("/list")
-    public TableDataInfo list(SysOperLog operLog)
-    {
+    public TableDataInfo list(SysOperLog operLog) {
         startPage();
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
         return getDataTable(list);
@@ -49,8 +48,7 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @RequiresPermissions("system:operlog:export")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysOperLog operLog)
-    {
+    public void export(HttpServletResponse response, SysOperLog operLog) {
         List<SysOperLog> list;
         list = operLogService.selectOperLogList(operLog);
         //根据前端列表选中选择性列表导出
@@ -65,24 +63,21 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.DELETE)
     @RequiresPermissions("system:operlog:remove")
     @DeleteMapping("/{operIds}")
-    public AjaxResult remove(@PathVariable Long[] operIds)
-    {
+    public AjaxResult remove(@PathVariable Long[] operIds) {
         return toAjax(operLogService.deleteOperLogByIds(operIds));
     }
 
     @RequiresPermissions("system:operlog:remove")
     @Log(title = "操作日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public AjaxResult clean()
-    {
+    public AjaxResult clean() {
         operLogService.cleanOperLog();
         return success();
     }
 
     @InnerAuth
     @PostMapping
-    public AjaxResult add(@RequestBody SysOperLog operLog)
-    {
+    public AjaxResult add(@RequestBody SysOperLog operLog) {
         return toAjax(operLogService.insertOperlog(operLog));
     }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysOperLogServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysOperLogServiceImpl.java
index 9be7b09a..01d886f3 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysOperLogServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysOperLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.bonus.sgzb.system.service.impl;
 
 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.sgzb.system.api.domain.SysOperLog;
@@ -9,60 +10,55 @@ import com.bonus.sgzb.system.service.ISysOperLogService;
 
 /**
  * 操作日志 服务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class SysOperLogServiceImpl implements ISysOperLogService
-{
+public class SysOperLogServiceImpl implements ISysOperLogService {
     @Autowired
     private SysOperLogMapper operLogMapper;
 
     /**
      * 新增操作日志
-     * 
+     *
      * @param operLog 操作日志对象
      * @return 结果
      */
     @Override
-    public int insertOperlog(SysOperLog operLog)
-    {
+    public int insertOperlog(SysOperLog operLog) {
         return operLogMapper.insertOperlog(operLog);
     }
 
     /**
      * 查询系统操作日志集合
-     * 
+     *
      * @param operLog 操作日志对象
      * @return 操作日志集合
      */
     @Override
-    public List<SysOperLog> selectOperLogList(SysOperLog operLog)
-    {
+    public List<SysOperLog> selectOperLogList(SysOperLog operLog) {
         return operLogMapper.selectOperLogList(operLog);
     }
 
     /**
      * 批量删除系统操作日志
-     * 
+     *
      * @param operIds 需要删除的操作日志ID
      * @return 结果
      */
     @Override
-    public int deleteOperLogByIds(Long[] operIds)
-    {
+    public int deleteOperLogByIds(Long[] operIds) {
         return operLogMapper.deleteOperLogByIds(operIds);
     }
 
     /**
      * 查询操作日志详细
-     * 
+     *
      * @param operId 操作ID
      * @return 操作日志对象
      */
     @Override
-    public SysOperLog selectOperLogById(Long operId)
-    {
+    public SysOperLog selectOperLogById(Long operId) {
         return operLogMapper.selectOperLogById(operId);
     }
 
@@ -70,8 +66,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService
      * 清空操作日志
      */
     @Override
-    public void cleanOperLog()
-    {
+    public void cleanOperLog() {
         operLogMapper.cleanOperLog();
     }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
index 2c392614..9871bc28 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
@@ -309,6 +309,18 @@ public class SysUserServiceImpl implements ISysUserService {
         userPostMapper.deleteUserPostByUserId(userId);
         // 新增用户与岗位管理
         insertUserPost(user);
+        Long deptId = user.getDeptId();
+        SysDept sysDept = deptMapper.selectDeptById(deptId);
+        String ancestors = sysDept.getAncestors();
+        String[] split = ancestors.split(",");
+        if (split.length == 2) {
+            //表示属于分公司
+            user.setCompanyId(sysDept.getDeptId());
+        }
+        if (split.length >= 3) {
+            //表示属于分公司下的某个部门
+            user.setCompanyId(Long.parseLong(split[2]));
+        }
         return userMapper.updateUser(user);
     }
 
diff --git a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
index 13e6331a..4b505ba1 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
+++ b/sgzb-modules/sgzb-system/src/main/resources/bootstrap.yml
@@ -2,6 +2,12 @@
 server:
   port: 29201
 
+# Spring Boot Actuator V2中风险漏洞处理，禁止远程端口访问
+management:
+  endpoint:
+    env:
+      enabled: false
+
 # Spring
 spring:
   servlet:
@@ -25,11 +31,11 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.0.14:8848
         namespace: sgzb_cloud_dev
         # 配置文件格式
         file-extension: yml
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
index 2507360f..3cc848ab 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -195,6 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="loginDate != null">login_date = #{loginDate},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
+ 			<if test="companyId != null">company_id = #{companyId},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}