Compare commits

..

No commits in common. "1bee1508241e528f4f6e59ed5cd88b2a43c87b2f" and "dce1cf7d029bab403a8a89ba01744be96fac2638" have entirely different histories.

2 changed files with 5 additions and 13 deletions

View File

@ -98,10 +98,8 @@ public class DocumentScreenImpl implements DocumentScreenService {
if("1".equals(type)){
vo.setPublicFolderId(vo.getParentId());
vo.setParentId("0");
}else {
vo.setParentId(vo.getParentId().split("_")[2]);
}
vo.setParentIds(vo.getParentIds()+vo.getParentId()+",");
vo.setParentIds(vo.getParentIds()+vo.getParentId()+",");
/**
* 查询文件夹名称是否重复
*/
@ -110,6 +108,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
return AjaxResult.error("文件夹名称已存在");
}
Integer num2= mapper.addDocumentCompany(vo);
if("1".equals(type)){
vo.setAuthType("4");
//创建的都是4
@ -125,6 +124,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
return AjaxResult.success("添加成功");
}
return AjaxResult.success("添加成功");
}catch (Exception e){
log.error(e.toString(),e);

View File

@ -84,17 +84,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!--文件夹名称是否存在-->
<select id="getDocumentByNum" resultType="java.lang.Integer">
<if test='type=="1" or type==1 '>
select count(1)
from tb_user_document_folder udf
left join tb_public_real_user tpr on tpr.user_folder_id=udf.id and tpr.data_type=1
where del_flag=0 and file_type=0 and udf.folder_name=#{folderName} AND tpr.public_folder_id=#{publicFolderId}
</if>
<if test='type=="2" or type==2 '>
select count(1)
select count(1)
from tb_user_document_folder
where del_flag=0 and file_type=0 and folder_name=#{folderName} AND parent_id=#{parentId}
</if>
where del_flag=0 and file_type=0 and folder_name=#{folderName}
</select>
<!--查询文件夹数据集合-->
<select id="getDocumentFileList" resultType="com.bonus.business.domain.TbUserFiles">