diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index b0d1acc3..829613f6 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1923,7 +1923,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl controlList = requestManageMapper.getProcessSelect2(cData); if (controlList.isEmpty()) { - throw new RuntimeException("该节点没有权限,不能执行!"); + throw new RuntimeException("当前节点不能点击执行,请检查流程节点配置!"); } // 提交 submitChange(data); diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 27350832..0be31e35 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -481,7 +481,7 @@ insert into plm_change_item (site, change_no, item_no, item_desc, execute_flag, executor, item_execution_date, item_remark, create_date, create_by, code_no) VALUES - (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}) + (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate,jdbcType=TIMESTAMP}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}) @@ -490,7 +490,7 @@ insert into plm_change_FA_item (site, change_no, item_no, item_desc, execute_flag, executor, item_execution_date, item_remark, create_date, create_by, code_no, choose_value) VALUES - (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}, #{item.chooseValue}) + (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate,jdbcType=TIMESTAMP}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}, #{item.chooseValue}) @@ -759,7 +759,7 @@ insert into plm_change_countersignature_item (site, change_no, item_no, item_desc, execute_flag, executor, item_execution_date, item_remark, create_date, create_by, code_no) VALUES - (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo}) + (#{item.site}, #{item.changeNo}, #{item.itemNo}, #{item.itemDesc}, #{item.executeFlag}, #{item.executor}, #{item.itemExecutionDate,jdbcType=TIMESTAMP}, #{item.itemRemark}, getDate(), #{item.createBy}, #{item.codeNo})