bug修复

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java

@@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage;
 import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService;
+import com.adc.da.slrs.zlTree.dao.ZlTreeDataDao;
 import com.adc.da.slrs.zlTree.entity.ZlTreeData;
 import com.adc.da.slrs.zlTree.service.IZlTreeDataService;
 import com.adc.da.util.UUIDUtils;
@@ -44,6 +45,9 @@ public class FileMaterialController extends BaseController<FileMaterial> {
     @Autowired
     IZlTreeDataService iZlTreeService;
 
+    @Autowired
+    ZlTreeDataDao zlTreeDataDao;
+
     @PostMapping
     @ApiOperation("新增文件资料组")
     public ResponseMessage addFileMaterial(@RequestBody FileMaterial material){
@@ -95,12 +99,7 @@ public class FileMaterialController extends BaseController<FileMaterial> {
     @ApiOperation("修改文件资料组")
     public ResponseMessage updateFileMaterial(@RequestBody FileMaterial fileMaterial){
         boolean b = iFileMaterialService.updateById(fileMaterial);
-        ZlTreeData zlTreeData=new ZlTreeData();
-        zlTreeData.setId(fileMaterial.getTreeId());
-        zlTreeData.setDataId(fileMaterial.getId());
-        QueryWrapper<ZlTreeData> wrapper=new QueryWrapper<>();
-        wrapper.eq("data_id",fileMaterial.getId());
-        iZlTreeService.update(zlTreeData,wrapper);
+        zlTreeDataDao.updateZT(fileMaterial.getTreeId(),fileMaterial.getId());
         return Result.success(b);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java

@@ -75,4 +75,7 @@ public class FileMaterial extends BaseEntity {
     @ApiModelProperty(value = "树id")
     @TableField(exist = false)
     private String treeId;
+
+    @TableField(exist = false)
+    private String treeName;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDataDao.java

@@ -2,6 +2,8 @@ package com.adc.da.slrs.zlTree.dao;
 
 import com.adc.da.slrs.zlTree.entity.ZlTreeData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * <p>
@@ -13,5 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ZlTreeDataDao extends BaseMapper<ZlTreeData> {
 
+    @Update("update  zl_data SET id = #{treeId}, data_id = #{dataId} WHERE data_id = #{dataId}")
+    boolean updateZT(@Param("treeId")String treeId,@Param("dataId")String dataId);
 
 }

adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml

@@ -18,10 +18,11 @@
     </update>
     <select id="getFileMaterialPage" resultType="com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial">
         SELECT
-          fm.*,zd.id as treeId
+          fm.*,zd.id as treeId,zt.name as treeName
         FROM
             file_material fm
             LEFT JOIN zl_data zd ON zd.data_id=fm.id
+            LEFT JOIN zl_tree zt ON zd.id=zt.id
         WHERE
             fm.del_flag = '0'
         <if test="flieM.treeId != null and flieM.treeId != ''">