Merge remote-tracking branch 'origin/master'

许鹏程

2024-08-28 4d610081d9d2da1a4db118ce260d5afeea312d9f

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/product/file/service/DocumentService.java

 src/main/java/com/product/file/controller/DocumentDirectoryController.java

@@ -71,88 +71,21 @@
    }

    /**
     * 新增文件夹数据
     * 文档目录保存
     *
     * @param request
     * @return
     */
    @RequestMapping(value = "/addDocumentDirectory/{version}", method = RequestMethod.POST)
    @RequestMapping(value = "/save-directory/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String addDocumentDirectory(HttpServletRequest request) {
    public String saveDocumentDireactory(HttpServletRequest request) {
        try {
            // 获取参数
            FieldSetEntity fse = null;
            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
            if (bean != null) {
                RequestParameterEntity reqp = (RequestParameterEntity) bean;
                fse = reqp.getFormData();
            }
            // 判断参数是否为空
            if (fse == null) {
                SpringMVCContextHolder.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(),
                        DocumentCode.DOCUMENT_FORM_NODATA.getText());
                return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(),
                        DocumentCode.DOCUMENT_FORM_NODATA.getText());
            }
            FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
            IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
            return OK_Add(service.addDocumentDirectory(fse));
        } catch (BaseException e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return this.error(e);
        } catch (Exception e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return this.error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
                    DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
        }
    }

    /**
     * 修改文件夹
     *
     * @param request
     * @return
     */
    @RequestMapping(value = "/upDocumentDirectory/{version}", method = RequestMethod.POST)
    @ApiVersion(1)
    public String upDocumentDirectory(HttpServletRequest request) {
        try {
            // 获取参数
            FieldSetEntity fse = null;
            Object bean = request.getAttribute(CoreConst.API_POST_REQUEST_DATA);
            if (bean != null) {
                RequestParameterEntity reqp = (RequestParameterEntity) bean;
                fse = reqp.getFormData();
            }
            // 判断参数是否为空
            if (fse == null) {
                SpringMVCContextHolder.getSystemLogger().error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(),
                        DocumentCode.DOCUMENT_FORM_NODATA.getText());
                return this.error(DocumentCode.DOCUMENT_FORM_NODATA.getValue(),
                        DocumentCode.DOCUMENT_FORM_NODATA.getText());
            }
            String uuid = fse.getString(CmnConst.UUID);// 表uuid
            // 超级管理员为1 普通单位管理员2
            SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
            int type;
            if (currentUser.getUserType() == 2) {
                type = CoreConst.DATA_PERMISSION_VALID_TYPE_ORG;
            } else {
                type = CoreConst.DATA_PERMISSION_VALID_TYPE_USER;
            }
            // 数据操作的权限验证
            if (!permissionService.validDataPermission(CmnConst.PRODUCT_OA_DIRECTORY, uuid, type)) {
                SpringMVCContextHolder.getSystemLogger().error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(),
                        SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText());
                return this.error(SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getValue(),
                        SystemErrorCode.SYSTEM_NOT_OPER_PERMISSION.getText());
            }
            IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
            if (service.upDocumentDirectory(fse)) {
            if(service.saveDocumentDireactory(fse)) {
                return OK();
            }
            return this.error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
            return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
                    DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
        } catch (BaseException e) {
            SpringMVCContextHolder.getSystemLogger().error(e);
@@ -160,7 +93,7 @@
        } catch (Exception e) {
            e.printStackTrace();
            SpringMVCContextHolder.getSystemLogger().error(e);
            return this.error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
            return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
                    DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
        }
    }

 src/main/java/com/product/file/service/DocumentDirectoryService.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.product.common.collect.ListUtils;
import com.product.common.lang.DateUtils;
import com.product.core.config.CoreConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
@@ -52,68 +53,41 @@
        return dtTree;
    }

    @Override
    /**
     *     文档目录保存
     * @param fse
     * @return
     */
    @Transactional
    public String addDocumentDirectory(FieldSetEntity fieldSetEntity) throws BaseException {

        String triCode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE,
                !StringUtils.isEmpty(fieldSetEntity.getString(CmnConst.TRICODE_PARENT))
                        ? fieldSetEntity.getString(CmnConst.TRICODE_PARENT)
                        : "");
        fieldSetEntity.setValue(CmnConst.TRICODE, triCode);
        String[] codes = triCode.split("-");
        String org_level_uuid = SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid();
        fieldSetEntity.setValue(CmnConst.ORG_LEVEL_UUID, org_level_uuid);
        fieldSetEntity.setValue(CmnConst.DIRECTORY_TIER, codes.length);
        fieldSetEntity.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());// 获取登录帐号
        fieldSetEntity.setValue(CmnConst.CREATED_UTC_DATETIME, DateUtils.getDateTime());// 创建时间
        return baseDao.add(fieldSetEntity);
    }

    @Override
    @Transactional
    public boolean upDocumentDirectory(FieldSetEntity fieldSetEntity) throws BaseException {
        String uuid = fieldSetEntity.getString(CmnConst.UUID);
        FieldSetEntity fieldSet = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_DIRECTORY, uuid, false);
        String tricode_parent1 = fieldSetEntity.getString(CmnConst.TRICODE_PARENT);
        String tricode_parent2 = fieldSet.getString(CmnConst.TRICODE_PARENT);
        boolean flag;
        // 上级目录tricode如果不相等
        if (!StringUtils.isEmpty(tricode_parent1) || !StringUtils.isEmpty(tricode_parent2)) {
            if (!StringUtils.isEmpty(tricode_parent1) && !StringUtils.isEmpty(tricode_parent2)
                    && !tricode_parent1.equals(tricode_parent2)) {
                flag = true;
            } else if (!StringUtils.isEmpty(tricode_parent1) && !StringUtils.isEmpty(tricode_parent2)
                    && tricode_parent1.equals(tricode_parent2)) {
                flag = false;
            } else if (!StringUtils.isEmpty(tricode_parent1) && StringUtils.isEmpty(tricode_parent2)) {
                tricode_parent2 = "";
                flag = true;
            } else if (!StringUtils.isEmpty(tricode_parent2) && StringUtils.isEmpty(tricode_parent1)) {
                tricode_parent1 = "";
                flag = true;
    public boolean saveDocumentDireactory(FieldSetEntity fse) {
        BaseUtil.createCreatorAndCreationTime(fse);
        String tricode = null;
        String tricodeParent = BaseUtil.strIsNull(fse.getString(CmnConst.TRICODE_PARENT)) ? "" : fse.getString(CmnConst.TRICODE_PARENT);
        if(BaseUtil.strIsNull(fse.getUUID())) {
            tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, tricodeParent);
            } else {
                flag = false;
            FieldSetEntity fseOrigin = baseDao.getFieldSetEntity(CmnConst.PRODUCT_OA_DIRECTORY, fse.getUUID(), false);
            if(fseOrigin == null) {
                fse.remove(CoreConst.UUID);
            }
        } else {
            flag = false;
        }

        if (flag) {
            StringBuffer sql = new StringBuffer();
            sql.append(" update PRODUCT_OA_directory set tricode=replace(");
            sql.append(" tricode,concat(?,'-'),concat(?,'-')),");
            sql.append(" tricode_parent=(case when tricode_parent=? then replace(tricode_parent,?,?) else ");
            sql.append(" replace (tricode_parent,concat(?,'-'),concat(?,'-')) end )");
            String originParent = BaseUtil.strIsNull(fseOrigin.getString(CmnConst.TRICODE_PARENT)) ? "" : fseOrigin.getString(CmnConst.TRICODE_PARENT);
            if (!originParent.equals(tricodeParent)) {
                String originTricode = BaseUtil.strIsNull(fseOrigin.getString(CmnConst.TRICODE)) ? "" : fseOrigin.getString(CmnConst.TRICODE);
                tricode = CodeUtil.getNewCodeByTemp(CmnConst.PRODUCT_OA_DIRECTORY, CmnConst.TRICODE, tricodeParent);
                StringBuilder sql = new StringBuilder();
                sql.append("update product_oa_directory ");
                sql.append("set tricode=concat(replace(substring(tricode,1,locate(?,tricode)+length(?)),?,?),substring(tricode,locate(?,tricode)+length(?)+1)), ");
                sql.append("tricode_parent=concat(replace(substring(tricode_parent,1,locate(?,tricode_parent)+length(?)),?,?),substring(tricode_parent,locate(?,tricode_parent)+length(?)+1)) ");
            sql.append("  where  tricode like ?");
            baseDao.executeUpdate(sql.toString(), new String[] { tricode_parent1, tricode_parent2, tricode_parent1,
                    tricode_parent1, tricode_parent2, tricode_parent1, tricode_parent2, tricode_parent1 + "-%", });
                baseDao.executeUpdate(sql.toString(), new Object[] {originTricode,originTricode,originTricode,tricode,originTricode,originTricode,
                        originTricode,originTricode,originTricode,tricode,originTricode,originTricode,originTricode+"-%"});
            }
        }
        fse.setValue(CmnConst.TRICODE, tricode);
        fse.setValue(CmnConst.DIRECTORY_TIER, tricode.split(",").length);
        return baseDao.saveFieldSetEntity(fse);
        }

        fieldSetEntity.setValue(CmnConst.UPDATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());// 获取登录帐号
        fieldSetEntity.setValue(CmnConst.UPDATED_UTC_DATETIME, DateUtils.getDateTime());// 创建时间
        return baseDao.update(fieldSetEntity);
    }

    @Override
    @Transactional

 src/main/java/com/product/file/service/DocumentService.java

@@ -73,9 +73,6 @@
            fseDocument.setValue(CmnConst.FILE_SIZE, attachment.getString(CmnConst.ATTACHMENT_SIZE));
            fseDocument.setValue(CmnConst.CREATED_BY, SpringMVCContextHolder.getCurrentUser().getUser_id());
            fseDocument.setValue(CmnConst.CREATED_UTC_DATETIME, DateUtils.getDateTime());
            fseDocument.setValue("latest_version", fse.getObject("latest_version"));
            fseDocument.setValue("business_classify_uuid", fse.getObject("business_classify_uuid"));
            fseDocument.setValue("office_classify_uuid", fse.getObject("office_classify_uuid"));
            //文件名称
            String file_name = attachment.getString(CmnConst.FILE_NAME);
            fseDocument.setValue(CmnConst.FILE_NAME, file_name);
@@ -90,7 +87,7 @@
            BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
            fseDocumentHistory.setValue("document_uuid", documentUUID);
            fseDocumentHistory.setValue("attachment_uuid", attachment.getUUID());
            fseDocumentHistory.setValue("version_number", fseDocument.getObject("latest_version"));
            fseDocumentHistory.setValue("version_number", "v1");
            baseDao.add(fseDocumentHistory);

            uuidList.add(documentUUID);
@@ -156,7 +153,8 @@
        sql.append("LEFT JOIN product_sys_staffs B ON B.user_id = A.created_by \n");
        sql.append("LEFT JOIN product_sys_attachments C ON C.uuid = B.staff_avatar \n");
        sql.append("LEFT JOIN product_oa_document_collection D ON D.document_uuid = A.uuid AND D.created_by = ?");
        DataTableEntity documentData = baseDao.listTable(sql.toString(), new String[]{directory_uuid, SpringMVCContextHolder.getCurrentUserId()}, fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
        DataTableEntity documentData = baseDao.listTable(sql.toString(), new String[]{directory_uuid, SpringMVCContextHolder.getCurrentUserId()},
                fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
        baseDao.listInternationDataTable(documentData, null);
        return documentData;
    }
@@ -193,7 +191,10 @@
            fieldSetEntity.setValue(CmnConst.OPETYPE, opetype);
            fieldSetEntity.setValue(CmnConst.OPE_DOCUMENT, file_name[i]);
            StringBuffer state = new StringBuffer();
            state.append(opetype).append("了[").append(file_name[i]).append("]");
            state.append(opetype)
                    .append("了[")
                    .append(file_name[i])
                    .append("]");
            if (!BaseUtil.strIsNull(file_directory)) {
                state.append("到").append(file_directory).append("目录下");
            }
@@ -222,7 +223,13 @@
            fieldSetEntity.setValue(CmnConst.OPETYPE, opetype);
            fieldSetEntity.setValue(CmnConst.OPE_DOCUMENT, file_name[i]);
            StringBuffer state = new StringBuffer();
            state.append("把[").append(file_name[i]).append("]").append(opetype).append("为[").append(newFile_name[i]).append("]");
            state.append("把[")
                    .append(file_name[i])
                    .append("]")
                    .append(opetype)
                    .append("为[")
                    .append(newFile_name[i])
                    .append("]");
            fieldSetEntity.setValue(CmnConst.STATE, state.toString()); //说明
            fieldSetEntity.setValue(CmnConst.CREATED_BY, user.getUser_id());// 创建人
            fieldSetEntity.setValue(CmnConst.CREATED_UTC_DATETIME, DateUtils.getDateTime());// 创建时间
@@ -298,7 +305,9 @@
            FieldSetEntity org = baseDao.getFieldSetByFilter(CmnConst.PRODUCT_OA_DIRECTORY_RIGHTS, "directory_uuid=?", new String[]{directory_uuid}, false);
            if (verifyOrgExist(org.getString("storage_uuid"))) {
                StringBuffer sql = new StringBuffer();
                sql.append(" SELECT  substring_index(substring_index(a.rigths,',',b.help_topic_id+1),',',-1) fun FROM  PRODUCT_OA_directory_rights a ").append(" INNER join   mysql.help_topic b on b.help_topic_id < (length(a.rigths) - length(replace(a.rigths,',',''))+1) ").append(" WHERE a.directory_uuid = ? ");
                sql.append(" SELECT  substring_index(substring_index(a.rigths,',',b.help_topic_id+1),',',-1) fun FROM  PRODUCT_OA_directory_rights a ")
                        .append(" INNER join   mysql.help_topic b on b.help_topic_id < (length(a.rigths) - length(replace(a.rigths,',',''))+1) ")
                        .append(" WHERE a.directory_uuid = ? ");
                dataTableEntity = baseDao.listTable(sql.toString(), new String[]{directory_uuid});
            }
            StringBuffer button = new StringBuffer();
@@ -351,7 +360,10 @@
        //1为公司文件目录
        if ("1".equals(type)) {
            //String staffId = user.getCurrentStaff().getString("staff_id");
            sql.append(" select a.* from PRODUCT_OA_directory a  ").append(" LEFT JOIN (  SELECT a.directory_uuid FROM PRODUCT_OA_directory_rights a  LEFT JOIN product_sys_organizational_structure_storage b ").append(" on a.storage_uuid = b.uuid WHERE a.rigths like '%3%' AND CONCAT(',',b.staff_ids,',') like ? GROUP BY ").append(" a.directory_uuid) b ON a.uuid = b.directory_uuid  where a.directory_type = 1  and a.org_level_uuid = ? ");
            sql.append(" select a.* from PRODUCT_OA_directory a  ")
                    .append(" LEFT JOIN (  SELECT a.directory_uuid FROM PRODUCT_OA_directory_rights a  LEFT JOIN product_sys_organizational_structure_storage b ")
                    .append(" on a.storage_uuid = b.uuid WHERE a.rigths like '%3%' AND CONCAT(',',b.staff_ids,',') like ? GROUP BY ")
                    .append(" a.directory_uuid) b ON a.uuid = b.directory_uuid  where a.directory_type = 1  and a.org_level_uuid = ? ");
            String staffId = "%" + user.getCurrentStaff().getString("staff_id") + "%";
            param.add(staffId);
            param.add(user.getOrg_level_uuid());
@@ -431,7 +443,9 @@
        //1为公司文件夹
        if (directory_type == 1) {
            StringBuffer sql = new StringBuffer();
            sql.append(" SELECT * FROM PRODUCT_OA_directory_rights  ").append(" WHERE directory_uuid = ? ").append(" AND rigths like '%3%' AND concat(',',storage_uuid,',') like ? ");//3为新增
            sql.append(" SELECT * FROM PRODUCT_OA_directory_rights  ")
                    .append(" WHERE directory_uuid = ? ")
                    .append(" AND rigths like '%3%' AND concat(',',storage_uuid,',') like ? ");//3为新增
            String user_id = String.valueOf(SpringMVCContextHolder.getCurrentUser().getUser_id());
            user_id = "%," + user_id + ",%";
            DataTableEntity dataTableEntity = baseDao.listTable(sql.toString(), new String[]{directory_uuid, user_id});
@@ -464,12 +478,12 @@

    @Override
    public DataTableEntity getDocumentLog(FieldSetEntity fieldSetEntity) throws BaseException {
        return baseDao.listTable("SELECT CONCAT(b.show_name, a.state) log,a.created_utc_datetime FROM PRODUCT_OA_document_log a LEFT JOIN product_sys_staffs b on a.created_by = b.user_id WHERE document_uuid = ? ORDER BY a.created_utc_datetime DESC", new String[]{fieldSetEntity.getString(CmnConst.DOCUMENT_UUID)}, fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
        return baseDao.listTable("SELECT CONCAT(b.show_name, a.state) log,a.created_utc_datetime FROM PRODUCT_OA_document_log a LEFT JOIN product_sys_staffs b on a.created_by = b.user_id WHERE document_uuid = ? ORDER BY a.created_utc_datetime DESC",
                new String[]{fieldSetEntity.getString(CmnConst.DOCUMENT_UUID)}, fieldSetEntity.getInteger(CmnConst.PAGESIZE), fieldSetEntity.getInteger(CmnConst.CPAGE));
    }

    /**
     * 文档收藏
     *
     * @param fse
     * @return
     */
@@ -481,7 +495,6 @@

    /**
     * 文档取消收藏
     *
     * @param documentUUID
     * @return
     */
@@ -491,23 +504,21 @@

    /**
     * 查询文档历史版本
     *
     * @param documentUUID
     * @return
     */
    public DataTableEntity findDocumentHistory(String documentUUID) {
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT A.*,B.file_name\n");
        sql.append("SELECT A.*,B.file_name");
        sql.append("FROM product_oa_document_history A \n");
        sql.append("LEFT JOIN product_oa_document B ON B.uuid = A.document_uuid \n");
        sql.append("WHERE A.document_uuid = ?\n");
        sql.append("LEFT JOIN product_oa_document_history B ON B.uuid = A.document_uuid \n");
        sql.append("WHERE A.document_uuid = ?");
        sql.append("ORDER BY A.version_number");
        return baseDao.listTable(sql.toString(), new Object[]{documentUUID});
    }

    /**
     * 文档最新版本保存
     *
     * @param fse
     * @return
     */
@@ -515,7 +526,7 @@
    public boolean documentSaveNewVersion(FieldSetEntity fse) {
        // 获取文档数据和最大编号
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT A.*, IFNULL(B.max_version_number, '0')AS max_version_number \n");
        sql.append("SELECT A.*, IFNULL(B.max_version_number, 'v0')AS max_version_number \n");
        sql.append("FROM product_oa_document A \n");
        sql.append("LEFT JOIN ( \n");
        sql.append("    SELECT document_uuid, MAX(version_number) AS max_version_number \n");
@@ -524,33 +535,19 @@
        sql.append("    GROUP BY document_uuid \n");
        sql.append(") B ON B.document_uuid = A.uuid \n");
        sql.append("WHERE uuid = ? \n");
        String documentUuid = fse.getString("document_uuid");
        FieldSetEntity fseDocument = baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[]{documentUuid, documentUuid}, false);
        FieldSetEntity fseDocument = baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[] {fse.getString("document_uuid"),fse.getString("document_uuid")}, false);
        if (fseDocument == null) {
            throw new BaseException(DocumentCode.DOCUMENT_DATA_NO_EXIST.getValue(), DocumentCode.DOCUMENT_DATA_NO_EXIST.getText());
        }

        String attachmentUuid = fse.getString("attachment_uuid");
        FieldSetEntity fieldSetEntity = baseDao.getFieldSetEntity(CmnConst.PRODUCT_SYS_ATTACHMENTS, attachmentUuid, false);
        fseDocument.setValue("file_size", fieldSetEntity.getString(CmnConst.ATTACHMENT_SIZE));
        fseDocument.setValue("file_name", fieldSetEntity.getString("file_name"));
        fseDocument.setValue("attachments_uuid", attachmentUuid);
        fseDocument.setValue("latest_version", fseDocument.getInteger("max_version_number") + 1);

        fseDocument.setValue("attachments_uuid", fse.getString("attachment_uuid"));
        baseDao.saveFieldSetEntity(fseDocument);

        //创建文档版本数据容器
        FieldSetEntity fseDocumentHistory = new FieldSetEntity(CmnConst.PRODUCT_OA_DOCUMENT_HISTORY);
        BaseUtil.createCreatorAndCreationTime(fseDocumentHistory);
        fseDocumentHistory.setValue("document_uuid", documentUuid);
        fseDocumentHistory.setValue("attachment_uuid", attachmentUuid);
        fseDocumentHistory.setValue("version_number", fseDocument.getObject("latest_version"));
        return baseDao.saveFieldSetEntity(fseDocumentHistory);
        fse.setValue("version_number", versionNUmberAddne(fseDocument.getString("max_version_number")));
        return baseDao.saveFieldSetEntity(fse);
    }

    /**
     * 文档版本+1
     *
     * @param originNumber
     * @return
     */
@@ -639,13 +636,13 @@
        StringBuilder sb = new StringBuilder();
        List<String> param = new ArrayList<>();
        sb.append(" SELECT b.* FROM (");
        sb.append(" SELECT t.uuid,t.file_name,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount");
        sb.append(" SELECT t.uuid,t.file_name,t.file_size,s.show_name,t.created_utc_datetime,count(t.uuid) as applyCount");
        sb.append(" FROM product_oa_document_borrow_sub b");
        sb.append(" JOIN product_oa_document t");
        sb.append(" on b.sub_uuid=t.uuid");
        sb.append(" JOIN product_sys_staffs s ");
        sb.append(" on t.created_by=s.user_id");
        sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime");
        sb.append(" group by t.file_name,t.uuid,s.show_name,t.created_utc_datetime,t.file_size");
        sb.append(" )b order by  b.applyCount asc");
        DataTableEntity dataTableEntity = baseDao.listTable(sb.toString(), param.toArray());
        return dataTableEntity;
@@ -658,14 +655,14 @@
        sb.append(" SELECT a.borrower,a.show_name,a.applayCount,a.applayFileCount ");
        sb.append(" FROM (");
        sb.append(" SELECT w.borrower,s.show_name,");
        sb.append(" (select   count(borrower)  from  product_oa_document_borrow group by borrower ) as  applayCount,");
        sb.append(" count( borrower )  AS applayCount,");
        sb.append(" count(sub_uuid) as applayFileCount ");
        sb.append(" FROM product_oa_document_borrow  w ");
        sb.append(" JOIN product_oa_document_borrow_sub b");
        sb.append(" left JOIN product_oa_document_borrow_sub b");
        sb.append(" on b.borrow_uuid=w.uuid");
        sb.append(" JOIN product_oa_document t");
        sb.append(" left JOIN product_oa_document t");
        sb.append(" on b.sub_uuid=t.uuid");
        sb.append(" JOIN product_sys_staffs s");
        sb.append(" left JOIN product_sys_staffs s");
        sb.append(" on w.borrower=s.user_id");
        sb.append(" GROUP BY w.borrower,s.show_name");
        sb.append(" )a");

 src/main/java/com/product/file/service/ide/IDocumentDirectoryService.java

@@ -16,21 +16,13 @@
 * @Description: 文件夹管理接口
 */
public interface IDocumentDirectoryService {
  /**
   *     新增文档目录
   * @param
   * @return
   * @throws BaseException
   */
  String addDocumentDirectory(FieldSetEntity fieldSetEntity) throws BaseException;

  /**
   * 修改文档目录
   * @param
     *     文档目录保存
     * @param fse
   * @return
   * @throws BaseException
   */
  boolean upDocumentDirectory(FieldSetEntity fieldSetEntity) throws BaseException;
    boolean saveDocumentDireactory(FieldSetEntity fse);

  /**
   * 删除文档目录