diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index a04e4ef..26a4e2c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -41,7 +41,6 @@
 public class ProcessUpdateStateListener implements ExecutionListener {
 
     @Override
-    @Transactional
     public void notify(DelegateExecution execution) {
         RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
         SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
@@ -115,12 +114,10 @@
         List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("id", equipmentIds).set("manager_state", state);
-        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-            // 修改对应该设备的管理状态
-            updateWrapper.in("id", equipmentIds).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) > 0) {
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
-            logUpdateWrapper.in("id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
+            logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
             stateChangeLogMapper.update(null, logUpdateWrapper);
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);

diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
index a04e4ef..26a4e2c 100644
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
+++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java
@@ -41,7 +41,6 @@
 public class ProcessUpdateStateListener implements ExecutionListener {
 
     @Override
-    @Transactional
     public void notify(DelegateExecution execution) {
         RepositoryService repositoryService = SpringContextUtil.getBean(RepositoryService.class);
         SystemFlowFormMapper flowFormMapper = SpringContextUtil.getBean(SystemFlowFormMapper.class);
@@ -115,12 +114,10 @@
         List<String> equipmentIds = equipmentApplyEquipments.stream().map(EquipmentApplyEquipment::getEquipmentId).collect(Collectors.toList());
         UpdateWrapper<EquipmentFixedAssets> updateWrapper = new UpdateWrapper<>();
         updateWrapper.in("id", equipmentIds).set("manager_state", state);
-        if (meterFixedAssetsMapper.update(null, updateWrapper) <= 0) {
-            // 修改对应该设备的管理状态
-            updateWrapper.in("id", equipmentIds).set("manager_state", state);
+        if (meterFixedAssetsMapper.update(null, updateWrapper) > 0) {
             UpdateWrapper<EquipmentStateChangeLog> logUpdateWrapper = new UpdateWrapper<>();
             // 修改状态变更记录结束时间
-            logUpdateWrapper.in("id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
+            logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date()));
             stateChangeLogMapper.update(null, logUpdateWrapper);
             // 获取当前申请的信息
             EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id);
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
index 0625714..f3b9c4f 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java
@@ -149,12 +149,12 @@
     @Override
     @Transactional
     public ReturnDTO agree(ApprovalAgreeRequest request) {
-//        AuthUser user = ShiroKit.getUser();
-//        Assert.isFalse(Objects.isNull(user), () -> {
-//            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
-//        });
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
         //设置同意发起人
-        Authentication.setAuthenticatedUserId(String.valueOf("1"));
+        Authentication.setAuthenticatedUserId(String.valueOf(user.getId()));
 
         Task task = taskService.createTaskQuery().taskId(request.getTaskId()).singleResult();
         if (StringUtils.isNotBlank(request.getComments())) {