소스 검색

objectDelete auth

shiqian 4 년 전
부모
커밋
bc33f19a47
1개의 변경된 파일6개의 추가작업 그리고 9개의 파일을 삭제
  1. 6 9
      boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

+ 6 - 9
boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -121,7 +121,7 @@ public class TableServiceCmdService {
         if (ActionType.INSERT.equals(context.getActionType())) {
             List<GenTableColumn> columns = context.getColumns();
             Long maxId = IdUtils.getMaxId(dto.getTable(), pkName);
-            ColumnUtils.packUpdateByAndTime(columns, commitData, new Timestamp(System.currentTimeMillis()), true);
+            packUpdateByAndTime(columns, commitData, new Timestamp(System.currentTimeMillis()), true);
             // 处理默认值
             handlerDefaultValue(commitData, columns);
             // 如果有单据、按照单据编号规则
@@ -208,17 +208,14 @@ public class TableServiceCmdService {
         List<RowResult> result = Lists.newArrayListWithCapacity(idArr.length);
         for (Long id : idArr) {
             // 校验权限
-            if (BooleanUtils.isTrue(checkAuthObjectDelete(genTable, id, pkName))) {
-                rowResult = deleteService.deleteById(dto.getTable(), pkName, id);
-                if (rowResult.isOk()) {
-                    LOGGER.info("删除成功, tableName: {}, id: {}, 操作人: {}", tableContext.getTableName(), id, getLoginUser().getUsername());
-                    continue;
-                }
-                LOGGER.info("删除失败, tableName: {}, id: {}, 操作人: {}", tableContext.getTableName(), id, getLoginUser().getUsername());
-            } else {
+            if (BooleanUtils.isFalse(checkAuthObjectDelete(genTable, id, pkName))) {
                 rowResult = RowResult.create(RowResult.FAIL, "无操作权限");
+                result.add(rowResult);
+                continue;
             }
 
+            rowResult = deleteService.deleteById(dto.getTable(), pkName, id);
+            LOGGER.info("删除" + (rowResult.isOk() ? "成功" : "失败") + ", tableName: {}, id: {}, 操作人: {}", tableContext.getTableName(), id, getLoginUser().getUsername());
             result.add(rowResult);
         }