系统bug修改

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java

@@ -274,7 +274,7 @@ public class TmTaskController extends BaseController {
      * 查询机具领料审核列表
      *
      * @param task 筛选条件
-     * @param souceBy app为1
+     * @param souceBy app为1   web为0
      * @return 列表
      */
     @Log(title = "查询机具领料审核列表", businessType = BusinessType.QUERY)

sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml

@@ -454,6 +454,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
         WHERE
             bai.id = #{id}
+        <if test="keyWord != null  and keyWord != ''">
+            and (mt2.type_name like concat('%', #{keyWord}, '%') or
+            mt.type_name like concat('%', #{keyWord}, '%'))
+        </if>
     </select>
     <select id="getUseTypeTree" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
         WITH RECURSIVE cte AS (

sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java

@@ -30,6 +30,8 @@ public class TreeNode {
 
     private String code;
 
+    private float num;
+
     private String modelCode;
 
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml

@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                unit_name AS unitName,
                company_id AS companyId,
                code,
+               num,
                model_code modelCode
         FROM ma_type
         WHERE del_flag = '0'