Commit 7698a39eea1b0207d782bf649438e26c627d5534
Merge remote-tracking branch 'origin/master_after0225' into master_after0225
Showing
2 changed files
with
7 additions
and
1 deletions
| @@ -329,7 +329,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { | @@ -329,7 +329,7 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { | ||
| 329 | /** | 329 | /** |
| 330 | * 创建人ID | 330 | * 创建人ID |
| 331 | */ | 331 | */ |
| 332 | - @TableField(fill = FieldFill.INSERT) | 332 | + @TableField(fill = FieldFill.DEFAULT) |
| 333 | private String createById; | 333 | private String createById; |
| 334 | 334 | ||
| 335 | /** | 335 | /** |
| @@ -246,7 +246,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde | @@ -246,7 +246,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde | ||
| 246 | } | 246 | } |
| 247 | if (!StringUtil.isBlank(vo.getContractCreateById())) { | 247 | if (!StringUtil.isBlank(vo.getContractCreateById())) { |
| 248 | data.setContractCreateById(vo.getContractCreateById()); | 248 | data.setContractCreateById(vo.getContractCreateById()); |
| 249 | + data.setCreateById(vo.getContractCreateById()); | ||
| 249 | } | 250 | } |
| 251 | + | ||
| 252 | + if (StringUtil.isBlank(data.getContractCreateById())) { | ||
| 253 | + data.setCreateById(SecurityUtil.getCurrentUser().getId()); | ||
| 254 | + } | ||
| 255 | + | ||
| 250 | data.setSampleOrder(vo.isSampleOrder()); | 256 | data.setSampleOrder(vo.isSampleOrder()); |
| 251 | 257 | ||
| 252 | 258 |