提交

jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalAccount.java

@@ -99,6 +99,6 @@ public class CapitalAccount extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-business/src/main/java/com/jy/business/capital/model/entity/CapitalTransactions.java

@@ -106,6 +106,6 @@ public class CapitalTransactions extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-business/src/main/java/com/jy/business/corporation/model/entity/Corporation.java

@@ -97,6 +97,6 @@ public class Corporation extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-flow/src/main/java/com/jy/flow/controller/DefController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.Collections;
 
 @RestController
 @RequestMapping("/flow/definition")
@@ -67,6 +67,15 @@ public class DefController {
     }
 
     /**
+     * 删除流程定义
+     */
+    @DeleteMapping("/{id}")
+    @Transactional(rollbackFor = Exception.class)
+    public boolean remove(@PathVariable(name = "id", required = true) Long id) {
+        return defService.removeDef(Collections.singletonList(id));
+    }
+
+    /**
      * 发布流程定义
      */
     @GetMapping("/publish/{id}")
@@ -85,15 +94,6 @@ public class DefController {
     }
 
     /**
-     * 删除流程定义
-     */
-    @DeleteMapping("/{ids}")
-    @Transactional(rollbackFor = Exception.class)
-    public boolean remove(@PathVariable List<Long> ids) {
-        return defService.removeDef(ids);
-    }
-
-    /**
      * 保存流程定义
      */
     @PostMapping("/saveXml")

jy-framework/src/main/java/com/jy/framework/mybatis/CustomMetaObjectHandler.java

@@ -35,7 +35,7 @@ public class CustomMetaObjectHandler implements MetaObjectHandler {
         setFieldValByName(CREATE_TIME, date, metaObject);
         setFieldValByName(UPDATE_USER, userId, metaObject);
         setFieldValByName(UPDATE_TIME, date, metaObject);
-        setFieldValByName(DEL_FLAG, 0L, metaObject);
+        setFieldValByName(DEL_FLAG, "0", metaObject);
         setFieldValByName(MP_VERSION, 0, metaObject);
     }
 

jy-starter/src/main/resources/application.yml

@@ -79,7 +79,7 @@ mybatis-plus:
       # 全局逻辑删除的实体字段名
       logic-delete-field: delFlag
       # 逻辑已删除值
-      logic-delete-value: id
+      logic-delete-value: 1
       # 逻辑未删除值
       logic-not-delete-value: 0
 

jy-system/src/main/java/com/jy/system/model/entity/SysConfig.java

@@ -85,6 +85,6 @@ public class SysConfig extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysDept.java

@@ -96,6 +96,6 @@ public class SysDept extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysDictData.java

@@ -92,6 +92,6 @@ public class SysDictData extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysDictType.java

@@ -79,6 +79,6 @@ public class SysDictType extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysMenu.java

@@ -122,6 +122,6 @@ public class SysMenu extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysPermission.java

@@ -81,6 +81,6 @@ public class SysPermission extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysRole.java

@@ -95,6 +95,6 @@ public class SysRole extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-system/src/main/java/com/jy/system/model/entity/SysUser.java

@@ -138,6 +138,6 @@ public class SysUser extends BaseIdPo {
      */
     @TableLogic
     @TableField(fill = FieldFill.INSERT)
-    private Long delFlag;
+    private String delFlag;
 
 }

jy-ui/src/api/flow/definition.ts

@@ -17,6 +17,11 @@ export function addDefinitionApi(params: StrAnyObj): Promise<StrAnyObj> {
 }
 
 // 修改流程定义
-export function updateDefinitionApi(id: string, params: StrAnyObj): Promise<StrAnyObj> {
+export function updateDefinitionApi(params: StrAnyObj): Promise<StrAnyObj> {
   return request.put(`/flow/definition`, params)
-}
+}
+
+// 删除流程定义
+export function deleteDefinitionApi(id: string): Promise<StrAnyObj> {
+  return request.delete(`/flow/definition/${id}`)
+}

jy-ui/src/views/flow/definition/index.vue

@@ -5,14 +5,18 @@ import { ToolbarConfigType } from '@/components/AToolbar/type'
 import { ColumnConfigType } from '@/components/ATable/type'
 import { StrAnyObj, StrAnyObjArr } from '@/typings'
 import { useHandleData } from '@/utils/useHandleData'
-import { deleteApi } from '@/api/system/config'
-import { addDefinitionApi, getDefinitionApi, getDefinitionPageApi, updateDefinitionApi } from "@/api/flow/definition";
+import {
+  addDefinitionApi,
+  deleteDefinitionApi,
+  getDefinitionApi,
+  getDefinitionPageApi,
+  updateDefinitionApi
+} from "@/api/flow/definition";
 
 const queryRef = ref<InstanceType<typeof AForm>>()
 const formRef = ref<InstanceType<typeof AForm>>()
 
 const showQuery = ref<boolean>(true)
-const selectKeys = ref<string[]>([])
 const pageTotal = ref<number>(0)
 
 const queryData = ref<StrAnyObj>({ pageNum: 1, pageSize: 10 })
@@ -62,16 +66,6 @@ const toolbarConfig: ToolbarConfigType[] = [
       dialogVisible.value = true
       dialogTitle.value = '新增'
     }
-  },
-  {
-    common: 'delete',
-    permissions: 'sysConfig:delete',
-    disabled() {
-      return selectKeys.value.length == 0
-    },
-    click() {
-      handleRemove(selectKeys.value)
-    }
   }
 ]
 
@@ -113,7 +107,7 @@ const columnConfig: ColumnConfigType[] = [
         click(row) {
           dialogVisible.value = true
           dialogTitle.value = '编辑'
-          getDefinitionApi({ id: row.id }).then((resp: StrAnyObj) => {
+          getDefinitionApi(row.id).then((resp: StrAnyObj) => {
             formData.value = resp
             if (formData.value.listenerType) {
               formData.value.listenerType = formData.value.listenerType.split(",")
@@ -125,7 +119,7 @@ const columnConfig: ColumnConfigType[] = [
         common: 'delete',
         permissions: 'sysConfig:delete',
         click(row) {
-          handleRemove([row.id])
+          handleRemove(row.id)
         }
       }
     ]
@@ -209,10 +203,6 @@ function getPage() {
   })
 }
 
-function tableSelectionChange(item: StrAnyObjArr) {
-  selectKeys.value = item.map((item) => item.id)
-}
-
 function formSubmit() {
   formRef.value?.validate(() => {
     formData.value.listenerType = formData.value.listenerType?.join(",")
@@ -237,9 +227,9 @@ function formClosed() {
   formRef.value?.resetFields()
 }
 
-function handleRemove(idList: string[]) {
+function handleRemove(id: string) {
   useHandleData('是否确认删除？', () => {
-    deleteApi({ idList }).then(() => {
+    deleteDefinitionApi(id).then(() => {
       ElMessage.success('删除成功')
       getPage()
     })
@@ -254,7 +244,6 @@ function handleRemove(idList: string[]) {
     </el-card>
 
     <a-table
-      selection
       :data="tableData"
       :page-total="pageTotal"
       :toolbar-config="toolbarConfig"
@@ -264,7 +253,6 @@ function handleRemove(idList: string[]) {
       v-model:page-size="queryData.pageSize"
       @page-num-change="getPage"
       @page-size-change="getPage"
-      @selection-change="tableSelectionChange"
     >
     </a-table>