Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6ac373d254
|
|
@ -65,12 +65,6 @@ public class WrkAuditRule extends BaseEntity {
|
|||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 规则内容
|
||||
*/
|
||||
@TableField(value = "content")
|
||||
private String content;
|
||||
|
||||
/**
|
||||
* 所属部门
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -18,6 +18,5 @@ public interface WrkAuditRuleService extends IService<WrkAuditRule> {
|
|||
|
||||
int saveOrUpdate(WrkAuditRuleDTO dto);
|
||||
|
||||
int update(WrkAuditRuleDTO dto);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,13 +106,10 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
|
|||
WrkAuditRule wrkAuditRule = new WrkAuditRule();
|
||||
BeanUtil.copyProperties(dto, wrkAuditRule);
|
||||
wrkAuditRule.setId(IdUtil.getSnowflakeNextId());
|
||||
wrkAuditRule.setDeptId(SecurityUtils.getDeptId());
|
||||
wrkAuditRule.setUserId(SecurityUtils.getUserId());
|
||||
return this.save(wrkAuditRule) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int update(WrkAuditRuleDTO dto) {
|
||||
|
||||
return this.removeById(dto.getId()) ? 1 : 0;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue