diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 8f2ca35..7b8c622 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -50,7 +50,7 @@ public static String getSourceByCode(String code){ for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { - if(applyFromIdEnum.getSource().equals(code)){ + if(applyFromIdEnum.getCode().equals(code)){ return applyFromIdEnum.getSource(); } } @@ -59,7 +59,7 @@ public static String getValueByCode(String code){ for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { - if(applyFromIdEnum.getValue().equals(code)){ + if(applyFromIdEnum.getCode().equals(code)){ return applyFromIdEnum.getValue(); } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java index 8f2ca35..7b8c622 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApplyFromIdEnum.java @@ -50,7 +50,7 @@ public static String getSourceByCode(String code){ for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { - if(applyFromIdEnum.getSource().equals(code)){ + if(applyFromIdEnum.getCode().equals(code)){ return applyFromIdEnum.getSource(); } } @@ -59,7 +59,7 @@ public static String getValueByCode(String code){ for (ApplyFromIdEnum applyFromIdEnum : ApplyFromIdEnum.values()) { - if(applyFromIdEnum.getValue().equals(code)){ + if(applyFromIdEnum.getCode().equals(code)){ return applyFromIdEnum.getValue(); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java index 1edbc1b..6c94ae6 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/WorkbenchApprovalMessageServiceImpl.java @@ -166,6 +166,7 @@ WorkbenchApprovalMessage message = new WorkbenchApprovalMessage(); if(Objects.isNull(updateRequest.getId())){ String formId = updateRequest.getFormId(); + message.setNoticeId(ShiroKit.getUser().getId()); message.setFormId(formId); message.setMessageSourceModule(ApplyFromIdEnum.getSourceByCode(formId)); message.setMessageTitle("待审批通知");