From 35ada6f5efe54fe145f47d415000fe6e0f09432b Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Tue, 31 Jan 2023 15:13:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E5=8D=95=E6=8D=AE=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E8=83=BD=EF=BC=88=E5=8E=9F=E8=80=97=E6=9D=90?=
 =?UTF-8?q?=E9=A2=86=E7=94=A8=E8=AE=BE=E7=BD=AE=EF=BC=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/BasicBusTypeChangeController.java |  5 +++--
 .../api/entity/basic/BasicBusTypeChangeEntity.java     | 10 ++--------
 .../mybatis/mapper/basic/BasicBusTypeChangeDao.xml     |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java
index 189805dd..7be26db9 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java
@@ -1,5 +1,6 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -91,11 +92,11 @@ public class BasicBusTypeChangeController {
      * @return
      */
     @PostMapping("/basic/bustype/change/delete")
-    public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) {
+    public BaseResponse delBussinessType(@RequestBody @Valid DeleteRequest deleteRequest, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        if (deleteRequest != null) {
+        if (deleteRequest != null && StrUtil.isNotBlank(deleteRequest.getId())) {
             basicBusTypeChangeService.deleteById(deleteRequest.getId());
         } else {
             return ResultVOUtils.error(999, "参数错误");
diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java
index 7ed1aee4..bde4dece 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java
@@ -43,19 +43,13 @@ public class BasicBusTypeChangeEntity {
      * 1:领用单据类型；2.产品申购类型；3.采购计划单据类型
      */
     @TableField(value = "`type`")
-    private Boolean type;
+    private Integer type;
 
     /**
      * 0:启用；1:禁用
      */
     @TableField(value = "`enable`")
-    private Boolean enable;
-
-    /**
-     * 是否系统预设
-     */
-    @TableField(value = "systemDefault")
-    private Boolean systemDefault;
+    private boolean enable;
 
     /**
      * 创建人
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml
index e9a72ff8..cbd30abd 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicBusTypeChangeDao">
     <select id="filterList" resultType="com.glxp.api.res.basic.BasicBusTypeChangeResponse">
-        select bc.*, bu.name
+        select bc.*, bu.name targetBusName
         from basic_bustype_change bc
                  left join basic_bussiness_type bu on bc.targetAction = bu.action
         <where>