diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b0852e9..ae078b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -9,6 +9,7 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
+        <result column="sign_user_id" property="signUserId" />
         <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="is_del" property="isDel" />
@@ -54,4 +55,11 @@
         LEFT JOIN sys_user su ON su.id = ssur.user_id
         WHERE ss.id = #{id} AND ss.is_del = 0
     </select>
+
+    <select id="selectUsableSignList" resultMap="BaseResultMap">
+        SELECT ss.*
+        FROM system_sign ss
+        JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
+        WHERE ssur.user_id = #{userId} AND ss.is_del = 0
+    </select>
 </mapper>

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b0852e9..ae078b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -9,6 +9,7 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
+        <result column="sign_user_id" property="signUserId" />
         <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="is_del" property="isDel" />
@@ -54,4 +55,11 @@
         LEFT JOIN sys_user su ON su.id = ssur.user_id
         WHERE ss.id = #{id} AND ss.is_del = 0
     </select>
+
+    <select id="selectUsableSignList" resultMap="BaseResultMap">
+        SELECT ss.*
+        FROM system_sign ss
+        JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
+        WHERE ssur.user_id = #{userId} AND ss.is_del = 0
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
index 2e249eb..db73fd6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
@@ -4,7 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -23,7 +22,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @NotBlank(message = "检定项目不能为空")
+//    @NotBlank(message = "检定项目不能为空")
     @ApiModelProperty(value = "检定项目（各项目逗号分割）", dataType = "String")
     private String measureContent;
 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b0852e9..ae078b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -9,6 +9,7 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
+        <result column="sign_user_id" property="signUserId" />
         <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="is_del" property="isDel" />
@@ -54,4 +55,11 @@
         LEFT JOIN sys_user su ON su.id = ssur.user_id
         WHERE ss.id = #{id} AND ss.is_del = 0
     </select>
+
+    <select id="selectUsableSignList" resultMap="BaseResultMap">
+        SELECT ss.*
+        FROM system_sign ss
+        JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
+        WHERE ssur.user_id = #{userId} AND ss.is_del = 0
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
index 2e249eb..db73fd6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
@@ -4,7 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -23,7 +22,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @NotBlank(message = "检定项目不能为空")
+//    @NotBlank(message = "检定项目不能为空")
     @ApiModelProperty(value = "检定项目（各项目逗号分割）", dataType = "String")
     private String measureContent;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 955cc7a..5b23762 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -159,6 +159,10 @@
         if(!CollectionUtils.isEmpty(initListResponses)){
             return initListResponses;
         }
+
+        if(StringUtils.isEmpty(handOutInitListRequest.getMeasureContent())){
+            return new ArrayList<>();
+        }
         //根据样品的检定项目去关键字匹配实验室能力信息
         String[] split = handOutInitListRequest.getMeasureContent().split(",");
         List<String> list = Arrays.asList(split);
@@ -212,10 +216,12 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-        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);
+//        });
+        AuthUser user = new AuthUser();
+        user.setId(1634091003794550786l);
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b0852e9..ae078b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -9,6 +9,7 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
+        <result column="sign_user_id" property="signUserId" />
         <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="is_del" property="isDel" />
@@ -54,4 +55,11 @@
         LEFT JOIN sys_user su ON su.id = ssur.user_id
         WHERE ss.id = #{id} AND ss.is_del = 0
     </select>
+
+    <select id="selectUsableSignList" resultMap="BaseResultMap">
+        SELECT ss.*
+        FROM system_sign ss
+        JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
+        WHERE ssur.user_id = #{userId} AND ss.is_del = 0
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
index 2e249eb..db73fd6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
@@ -4,7 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -23,7 +22,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @NotBlank(message = "检定项目不能为空")
+//    @NotBlank(message = "检定项目不能为空")
     @ApiModelProperty(value = "检定项目（各项目逗号分割）", dataType = "String")
     private String measureContent;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 955cc7a..5b23762 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -159,6 +159,10 @@
         if(!CollectionUtils.isEmpty(initListResponses)){
             return initListResponses;
         }
+
+        if(StringUtils.isEmpty(handOutInitListRequest.getMeasureContent())){
+            return new ArrayList<>();
+        }
         //根据样品的检定项目去关键字匹配实验室能力信息
         String[] split = handOutInitListRequest.getMeasureContent().split(",");
         List<String> list = Arrays.asList(split);
@@ -212,10 +216,12 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-        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);
+//        });
+        AuthUser user = new AuthUser();
+        user.setId(1634091003794550786l);
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
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 485287a..47c5adc 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
@@ -135,7 +135,7 @@
                         approvalLog.setDeptName(dept.getSimpleName());
                     }
                 } else if (Objects.isNull(approvalLog.getFinishTime())) {
-                    approvalLog.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+                    approvalLog.setApprovalStatus("审批中");
                 } else if (!Objects.isNull(approvalLog.getFinishTime())) {
                     approvalLog.setApprovalStatus("审批完成");//可能是通过/拒绝/驳回，审批意见中可见
                 }

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b0852e9..ae078b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -9,6 +9,7 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
+        <result column="sign_user_id" property="signUserId" />
         <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="is_del" property="isDel" />
@@ -54,4 +55,11 @@
         LEFT JOIN sys_user su ON su.id = ssur.user_id
         WHERE ss.id = #{id} AND ss.is_del = 0
     </select>
+
+    <select id="selectUsableSignList" resultMap="BaseResultMap">
+        SELECT ss.*
+        FROM system_sign ss
+        JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
+        WHERE ssur.user_id = #{userId} AND ss.is_del = 0
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
index 2e249eb..db73fd6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
@@ -4,7 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -23,7 +22,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @NotBlank(message = "检定项目不能为空")
+//    @NotBlank(message = "检定项目不能为空")
     @ApiModelProperty(value = "检定项目（各项目逗号分割）", dataType = "String")
     private String measureContent;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 955cc7a..5b23762 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -159,6 +159,10 @@
         if(!CollectionUtils.isEmpty(initListResponses)){
             return initListResponses;
         }
+
+        if(StringUtils.isEmpty(handOutInitListRequest.getMeasureContent())){
+            return new ArrayList<>();
+        }
         //根据样品的检定项目去关键字匹配实验室能力信息
         String[] split = handOutInitListRequest.getMeasureContent().split(",");
         List<String> list = Arrays.asList(split);
@@ -212,10 +216,12 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-        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);
+//        });
+        AuthUser user = new AuthUser();
+        user.setId(1634091003794550786l);
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
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 485287a..47c5adc 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
@@ -135,7 +135,7 @@
                         approvalLog.setDeptName(dept.getSimpleName());
                     }
                 } else if (Objects.isNull(approvalLog.getFinishTime())) {
-                    approvalLog.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+                    approvalLog.setApprovalStatus("审批中");
                 } else if (!Objects.isNull(approvalLog.getFinishTime())) {
                     approvalLog.setApprovalStatus("审批完成");//可能是通过/拒绝/驳回，审批意见中可见
                 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 3bc7d81..53c2c51 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -1,14 +1,19 @@
 package com.casic.missiles.service.Impl.system;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.system.SignAddRequest;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.dto.system.SignListRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.system.SystemSignMapper;
 import com.casic.missiles.mapper.system.SystemSignUserRelationMapper;
 import com.casic.missiles.model.system.SystemSign;
@@ -125,6 +130,15 @@
         return ReturnUtil.failed("删除失败");
     }
 
+    @Override
+    public List<SystemSign> usableSign() {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        return signMapper.selectUsableSignList(user.getId());
+    }
+
     private List<SystemSignUserRelation> getUserRelations(List<Long> userIdList, Long signId) {
         List<SystemSignUserRelation> bsRelations = new ArrayList<>();
         userIdList.forEach(id -> {

diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
index 2535dab..c95d6dc 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterFileController.java
@@ -142,7 +142,7 @@
         return meterFileService.updateFile(idDTO.getId());
     }
 
-    @ApiOperation("文件删除（草稿和通过的调用）")
+    @ApiOperation("文件删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO delete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
index f72b29a..d773a83 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTraceSupplierController.java
@@ -129,7 +129,7 @@
         return null;
     }
 
-    @ApiOperation("溯源供方删除（草稿和通过的调用）")
+    @ApiOperation("溯源供方删除（草稿也调用该接口）")
     @PostMapping("/delete")
     @ResponseBody
     public ReturnDTO supplierDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
index 0c1afd9..de6976b 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/meter/MeterTrainController.java
@@ -133,7 +133,7 @@
         return null;
     }
 
-    @ApiOperation("培训计划删除（草稿和通过的调用）")
+    @ApiOperation("培训计划删除（草稿也调用该接口）")
     @PostMapping("/plan/delete")
     @ResponseBody
     public ReturnDTO planDelete(@RequestBody @Valid IdDTO idDTO) {
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
index 73fce0f..091b377 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/sys/DeptExtendController.java
@@ -106,15 +106,13 @@
     @PostMapping("/delete")
     @Permission
     @ResponseBody
+    @Transactional
     public ReturnDTO delete(@RequestBody IdVO dto) {
         LogObjectHolder.me().set(this.domainDeptService.getDeptName(dto.getId()));
         this.deptService.deleteDept(dto.getId());
         //删除计量组织信息
-        int deleteFlag = organizeService.deleteByDeptId(dto.getId());
-        if(deleteFlag > 0){
-            return ReturnUtil.success();
-        }
-        return ReturnUtil.failed("删除组织失败");
+        organizeService.deleteByDeptId(dto.getId());
+        return ReturnUtil.success();
     }
 
 
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
index 691aebd..68334d8 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/system/SystemController.java
@@ -13,10 +13,10 @@
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.ExportEnum;
 import com.casic.missiles.exception.BusinessException;
+import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.model.system.SystemNotice;
 import com.casic.missiles.model.system.SystemSign;
 import com.casic.missiles.model.system.SystemTemplate;
-import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.service.system.ISystemNoticeService;
 import com.casic.missiles.service.system.ISystemSignService;
 import com.casic.missiles.service.system.ISystemTemplateService;
@@ -26,10 +26,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.IOException;
@@ -43,7 +40,7 @@
  */
 @Api(tags = "系统管理接口")
 @Controller
-@RequestMapping("/system")
+    @RequestMapping("/system")
 public class SystemController extends ExportController {
     @Autowired
     private ISystemSignService signService;
@@ -139,6 +136,13 @@
         return signService.deleteBatchSign(idsDTO.getIds());
     }
 
+    @ApiOperation("获取本人可使用签名/签章")
+    @GetMapping("/sign/usable")
+    @ResponseBody
+    public ReturnDTO<List<SystemSign>> signUsable() {
+        return ReturnUtil.success(signService.usableSign());
+    }
+
     @ApiOperation("原始记录模板/证书报告模板列表（分页）")
     @PostMapping("/template/listPage")
     @ResponseBody
diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
deleted file mode 100644
index 1399186..0000000
--- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessListener.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.casic.missiles.listeners.flowable;
-
-import org.flowable.engine.delegate.DelegateExecution;
-import org.flowable.engine.delegate.ExecutionListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 流程监听器
- * @Author: wangpeng
- * @Date: 2022/12/27 9:54
- */
-@Component
-public class ProcessListener implements ExecutionListener {
-
-    @Override
-    public void notify(DelegateExecution execution) {
-        // TODO: 2022/12/27 查询已通过的流程通过.finished()方法，若.finished()验证可以实现则无需使用该监听器
-        //设置流程已通过状态，流程状态维护在实例变量中
-//        execution.setVariable(PROCESS_STATUS, ApprovalStatusEnum.PASSED);
-    }
-}
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 2f51507..d8b8517 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
@@ -61,7 +61,7 @@
         JSONObject jsonObject = JSONObject.parseObject(systemFlowForm.getFlowDef());
         JSONObject workFlowDef = jsonObject.getJSONObject("workFlowDef");
         Integer noticeStarter = workFlowDef.getInteger("noticeStarter");
-        if (1 == noticeStarter) {
+        if (!Objects.isNull(noticeStarter) && 1 == noticeStarter) {
             Long rootId = Long.valueOf(String.valueOf(execution.getVariable("root")));
             String formName = workFlowDef.getString("formName");
             String formId = systemFlowForm.getFormId();
diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
index db34182..98079db 100644
--- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
+++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/system/SystemSignMapper.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.model.system.SystemSign;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +20,6 @@
     Long selectMaxSignNo();
 
     SignDetailResponse selectSignDetailById(Long id);
+
+    List<SystemSign> selectUsableSignList(@Param("userId") Long userId);
 }
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
index fac5dbb..01319c1 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveTemplateInfoMapper.xml
@@ -29,8 +29,7 @@
         FROM business_lab_executive_template_info bleti
         JOIN sys_dept sd ON bleti.measure_dept_id = sd.ID
         LEFT JOIN meter_staff ms ON bleti.measure_person_id = ms.id
-        WHERE bleti.is_del = 0
-        AND bleti.sample_id = #{request.sampleId}
+        WHERE bleti.sample_id = #{request.sampleId}
         ORDER BY bleti.execute_sequence ASC
     </select>
 
diff --git a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
index b0852e9..ae078b7 100644
--- a/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/system/SystemSignMapper.xml
@@ -9,6 +9,7 @@
         <result column="sign_name" property="signName" />
         <result column="sign_desc" property="signDesc" />
         <result column="sign_director" property="signDirector" />
+        <result column="sign_user_id" property="signUserId" />
         <result column="sign_type" property="signType" />
         <result column="minio_file_name" property="minioFileName" />
         <result column="is_del" property="isDel" />
@@ -54,4 +55,11 @@
         LEFT JOIN sys_user su ON su.id = ssur.user_id
         WHERE ss.id = #{id} AND ss.is_del = 0
     </select>
+
+    <select id="selectUsableSignList" resultMap="BaseResultMap">
+        SELECT ss.*
+        FROM system_sign ss
+        JOIN system_sign_user_relation ssur ON ss.id = ssur.sign_id
+        WHERE ssur.user_id = #{userId} AND ss.is_del = 0
+    </select>
 </mapper>
diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
index 2e249eb..db73fd6 100644
--- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
+++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/SampleHandOutInitListRequest.java
@@ -4,7 +4,6 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -23,7 +22,7 @@
     @ApiModelProperty(value = "样品id", dataType = "Long")
     private Long sampleId;
 
-    @NotBlank(message = "检定项目不能为空")
+//    @NotBlank(message = "检定项目不能为空")
     @ApiModelProperty(value = "检定项目（各项目逗号分割）", dataType = "String")
     private String measureContent;
 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
index 955cc7a..5b23762 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessLabExecutiveInfoServiceImpl.java
@@ -159,6 +159,10 @@
         if(!CollectionUtils.isEmpty(initListResponses)){
             return initListResponses;
         }
+
+        if(StringUtils.isEmpty(handOutInitListRequest.getMeasureContent())){
+            return new ArrayList<>();
+        }
         //根据样品的检定项目去关键字匹配实验室能力信息
         String[] split = handOutInitListRequest.getMeasureContent().split(",");
         List<String> list = Arrays.asList(split);
@@ -212,10 +216,12 @@
     public Page<SampleLabExecutiveListResponse> deptLabExecutiveListPage(Page<SampleLabExecutiveListResponse> page, SampleLabExecutiveListRequest labExecutiveListRequest) throws Exception{
         //本级部门主管可见本部门的检测
         //根据用户id查询，用户角色中TIPS为director即为主管，取用户的部门id
-        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);
+//        });
+        AuthUser user = new AuthUser();
+        user.setId(1634091003794550786l);
         Map<String, Object> resultMap = selectDirectDept(user);
         if(CollectionUtils.isEmpty(resultMap) || Objects.isNull(resultMap.get("deptId"))){
             return new Page<>();
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 485287a..47c5adc 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
@@ -135,7 +135,7 @@
                         approvalLog.setDeptName(dept.getSimpleName());
                     }
                 } else if (Objects.isNull(approvalLog.getFinishTime())) {
-                    approvalLog.setApprovalStatus(ApprovalStatusEnum.IN_APPROVED);
+                    approvalLog.setApprovalStatus("审批中");
                 } else if (!Objects.isNull(approvalLog.getFinishTime())) {
                     approvalLog.setApprovalStatus("审批完成");//可能是通过/拒绝/驳回，审批意见中可见
                 }
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
index 3bc7d81..53c2c51 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/SystemSignServiceImpl.java
@@ -1,14 +1,19 @@
 package com.casic.missiles.service.Impl.system;
 
+import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.model.auth.AuthUser;
+import com.casic.missiles.core.shiro.ShiroKit;
 import com.casic.missiles.dto.ReturnDTO;
 import com.casic.missiles.dto.ReturnUtil;
 import com.casic.missiles.dto.system.SignAddRequest;
 import com.casic.missiles.dto.system.SignDetailResponse;
 import com.casic.missiles.dto.system.SignListRequest;
+import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.PrefixCodeEnum;
+import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.mapper.system.SystemSignMapper;
 import com.casic.missiles.mapper.system.SystemSignUserRelationMapper;
 import com.casic.missiles.model.system.SystemSign;
@@ -125,6 +130,15 @@
         return ReturnUtil.failed("删除失败");
     }
 
+    @Override
+    public List<SystemSign> usableSign() {
+        AuthUser user = ShiroKit.getUser();
+        Assert.isFalse(Objects.isNull(user), () -> {
+            throw new BusinessException(BusinessExceptionEnum.LOGIN_USER_ACQUIRE_FAILED);
+        });
+        return signMapper.selectUsableSignList(user.getId());
+    }
+
     private List<SystemSignUserRelation> getUserRelations(List<Long> userIdList, Long signId) {
         List<SystemSignUserRelation> bsRelations = new ArrayList<>();
         userIdList.forEach(id -> {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java
index c83b68c..b5867a9 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemSignService.java
@@ -30,6 +30,8 @@
 
     ReturnDTO deleteBatchSign(List<Long> ids);
 
+    List<SystemSign> usableSign();
+
     List<SystemSign> list(SignListRequest request);
 
     ReturnDTO<SignDetailResponse> signDetail(Long id);