From 83172813f4b3fe4d2f57ea4835b225ac3590de58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 30 Aug 2024 00:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/service/impl/ProProjectApplyServiceImpl.java   | 3 +--
 .../resources/mapper/project/ProProjectApplyMapper.xml     | 7 ++++---
 yanzhu-ui/src/views/base/assetsType/index.vue              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yanzhu-mapper/src/main/java/com/yanzhu/project/service/impl/ProProjectApplyServiceImpl.java b/yanzhu-mapper/src/main/java/com/yanzhu/project/service/impl/ProProjectApplyServiceImpl.java
index 6fbc52d..fec534e 100644
--- a/yanzhu-mapper/src/main/java/com/yanzhu/project/service/impl/ProProjectApplyServiceImpl.java
+++ b/yanzhu-mapper/src/main/java/com/yanzhu/project/service/impl/ProProjectApplyServiceImpl.java
@@ -165,10 +165,9 @@ public class ProProjectApplyServiceImpl implements IProProjectApplyService
                     BaseAssetsType baseAssetsType = baseAssetsTypeMapper.selectBaseAssetsTypeById(proProjectApplyDetail.getAssetsId());
                     proProjectApplyDetail.setAssetsName(baseAssetsType.getName());
                     //为空时，重新查询并赋值
-                    if(proProjectApplyDetail.getTypeId()==null || StringUtils.isEmpty(proProjectApplyDetail.getTypeName())){
+                    if(proProjectApplyDetail.getTypeId()!=null && StringUtils.isEmpty(proProjectApplyDetail.getTypeName())){
                         //资产类型
                         BaseAssetsType parentAssetsType = baseAssetsTypeMapper.selectBaseAssetsTypeById(baseAssetsType.getParentId());
-                        proProjectApplyDetail.setTypeId(parentAssetsType.getId());
                         proProjectApplyDetail.setTypeName(parentAssetsType.getName());
                     }
                 }
diff --git a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
index bffede7..7639de5 100644
--- a/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
+++ b/yanzhu-mapper/src/main/resources/mapper/project/ProProjectApplyMapper.xml
@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="typeName"    column="sub_type_name"    />
         <result property="assetsId"    column="sub_assets_id"    />
         <result property="assetsName"    column="sub_assets_name"    />
+        <result property="assetsVersion"    column="sub_assets_version"    />
         <result property="assetsUnit"    column="sub_assets_unit"    />
         <result property="number"    column="sub_number"    />
         <result property="useTime"    column="sub_use_time"    />
@@ -73,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectProProjectApplyById" parameterType="Long" resultMap="ProProjectApplyProProjectApplyDetailResult">
         select a.id, a.dept_id, a.proj_id, a.proj_name, a.par_proj_name, a.apply_type, a.apply_status, a.apply_reason, a.apply_files, a.apply_user, a.use_time, a.is_del, sd.dept_name as createByDeptName, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
- b.id as sub_id, b.apply_id as sub_apply_id, b.super_type_key as sub_super_type_key, b.super_type_name as sub_super_type_name, b.type_id as sub_type_id, b.type_name as sub_type_name, b.assets_id as sub_assets_id, b.assets_name as sub_assets_name, b.assets_unit as sub_assets_unit, b.number as sub_number, b.use_time as sub_use_time, b.use_reason as sub_use_reason, b.price as sub_price, b.total_price as sub_total_price, b.is_del as sub_is_del, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
+ b.id as sub_id, b.apply_id as sub_apply_id, b.super_type_key as sub_super_type_key, b.super_type_name as sub_super_type_name, b.type_id as sub_type_id, b.type_name as sub_type_name, b.assets_id as sub_assets_id, b.assets_name as sub_assets_name, b.assets_version as sub_assets_version, b.assets_unit as sub_assets_unit, b.number as sub_number, b.use_time as sub_use_time, b.use_reason as sub_use_reason, b.price as sub_price, b.total_price as sub_total_price, b.is_del as sub_is_del, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from pro_project_apply a
         left join sys_dept sd on a.dept_id = sd.dept_id
         left join pro_project_apply_detail b on b.apply_id = a.id
@@ -166,9 +167,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchProProjectApplyDetail">
-        insert into pro_project_apply_detail( id, apply_id, super_type_key, super_type_name, type_id, type_name, assets_id, assets_name, assets_unit, number, use_time, use_reason, price, total_price, is_del, create_by, create_time, update_by, update_time, remark) values
+        insert into pro_project_apply_detail( id, apply_id, super_type_key, super_type_name, type_id, type_name, assets_id, assets_name, assets_unit, assets_version, number, use_time, use_reason, price, total_price, is_del, create_by, create_time, update_by, update_time, remark) values
 		<foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.id}, #{item.applyId}, #{item.superTypeKey}, #{item.superTypeName}, #{item.typeId}, #{item.typeName}, #{item.assetsId}, #{item.assetsName}, #{item.assetsUnit}, #{item.number}, #{item.useTime}, #{item.useReason}, #{item.price}, #{item.totalPrice}, #{item.isDel}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
+            ( #{item.id}, #{item.applyId}, #{item.superTypeKey}, #{item.superTypeName}, #{item.typeId}, #{item.typeName}, #{item.assetsId}, #{item.assetsName}, #{item.assetsVersion}, #{item.assetsUnit}, #{item.number}, #{item.useTime}, #{item.useReason}, #{item.price}, #{item.totalPrice}, #{item.isDel}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark})
         </foreach>
     </insert>
 </mapper>
\ No newline at end of file
diff --git a/yanzhu-ui/src/views/base/assetsType/index.vue b/yanzhu-ui/src/views/base/assetsType/index.vue
index 7e74fe4..d2ceda2 100644
--- a/yanzhu-ui/src/views/base/assetsType/index.vue
+++ b/yanzhu-ui/src/views/base/assetsType/index.vue
@@ -165,7 +165,7 @@ export default {
       open: false,
       // 查询参数
       queryParams: {
-        parentId: 0,
+        parentId: null,
         pageNum: 1,
         pageSize: 10,
         compyId: null,