设置自动生成业务单名字不显示bug修改

src/main/java/com/glxp/api/controller/basic/EntrustReceController.java

@@ -92,6 +92,14 @@ public class EntrustReceController extends BaseController {
         if (StrUtil.isEmpty(entrustReceEntity.getEntrustInv())) {
             return ResultVOUtils.error(500, "委托验收仓库不能为空！");
         }
+        if (StrUtil.isEmpty(entrustReceEntity.getAction())) {
+            return ResultVOUtils.error(500, "当前单据类型不能为空！");
+        }
+
+        if (entrustReceEntity.getEntrustUser()==null) {
+            return ResultVOUtils.error(500, "委托验收人不能为空！");
+        }
+
 
         InvWarehouseEntity curEntity = invWarehouseService.findByInvSubByCode(entrustReceEntity.getCurInv());
         InvWarehouseEntity entrustEntity = invWarehouseService.findByInvSubByCode(entrustReceEntity.getEntrustInv());

src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml

@@ -2,10 +2,13 @@
 <!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 targetName, bbc.originName targetBusName
+        SELECT
-        from basic_bustype_change bc
+        bc.*,
-                     left join basic_bussiness_type bu on bc.targetAction = bu.action
+        bu.NAME targetName,
-                     left join basic_bustype_change bbc on bc.originAction = bbc.targetAction
+        (select originName from basic_bustype_change where originAction = bc.targetBusAction) as targetBusName
+        FROM
+        basic_bustype_change bc
+        LEFT JOIN basic_bussiness_type bu ON bc.targetAction = bu.action
         <where>
             <if test="originAction != null and originAction != ''">
                 AND bc.originAction = #{originAction}