ly 1 gadu atpakaļ
vecāks
revīzija
8d5bdbb829

+ 2 - 2
src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -94,7 +94,7 @@ public class OnceWorkOrderProductionController extends BaseController {
     /**
      * 导出划款列表
      */
-    @PreAuthorize("@ss.hasPermi('business:deduction:export')")
+    @PreAuthorize("@ss.hasPermi('business:entrust:workOrder:current:export')")
     @Log(title = "单次任务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizWorkOrder conditions) throws NoSuchFieldException, IllegalAccessException {
@@ -192,7 +192,7 @@ public class OnceWorkOrderProductionController extends BaseController {
             record.setHandlerTime(new Date());
         }else {
             Long handlerId = workOrderRecordService.getById(record.getId()).getHandlerId();
-            if (handlerId != SecurityUtils.getUserId()){
+            if (!handlerId.equals(SecurityUtils.getUserId()) ){
                 return error("只能由当前办理人取消");
             }
             record.setHandlerId(null);

+ 2 - 0
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrder.java

@@ -244,6 +244,8 @@ public class BizWorkOrder extends BaseEntity {
     @TableField(exist = false)
     @Excel(name = "领取人", sort = 7)
     private String handlerName;
+
+
     @TableField(exist = false)
     @Excel(name = "完成人", sort = 9)
     private String recorderName;

+ 0 - 1
src/main/java/cn/ezhizao/project/business/workOrder/domain/BizWorkOrderRecord.java

@@ -62,7 +62,6 @@ public class BizWorkOrderRecord extends BaseEntity
     private Long recorderId;
     @ApiModelProperty(value = "办理人")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-
     private Long  handlerId;
     @ApiModelProperty(value = "根节点外键")
     private Long fromId;