Merge remote-tracking branch 'origin/master'

This commit is contained in:
ant 2024-07-30 09:06:21 +08:00
commit 6ac373d254
3 changed files with 2 additions and 12 deletions

View File

@ -65,12 +65,6 @@ public class WrkAuditRule extends BaseEntity {
@TableField(value = "remark")
private String remark;
/**
* 规则内容
*/
@TableField(value = "content")
private String content;
/**
* 所属部门
*/

View File

@ -18,6 +18,5 @@ public interface WrkAuditRuleService extends IService<WrkAuditRule> {
int saveOrUpdate(WrkAuditRuleDTO dto);
int update(WrkAuditRuleDTO dto);
}

View File

@ -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;
}
}