许鹏程
2023-08-22 84169fc928d887d606e12380cfa3c1409d04db2a
协同办公列表排序
已修改2个文件
6 ■■■■■ 文件已修改
src/main/java/com/product/administration/service/CooperatesService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/GoOutApplicationService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/administration/service/CooperatesService.java
@@ -1,6 +1,5 @@
package com.product.administration.service;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONArray;
import com.product.admin.service.UserService;
import com.product.administration.config.CmnConst;
@@ -9,7 +8,6 @@
import com.product.core.config.CoreConst;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldMetaEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.permission.PermissionService;
@@ -321,7 +319,7 @@
        if (!StringUtils.isEmpty(queryFilter)) {
            str.append(" and  ").append(queryFilter);
        }
        str.append(" ) a");
        str.append(" order by start_time desc) a");
        DataTableEntity dt = baseDao.listTable(str.toString(), new Object[]{user_id, 2}, fs.getInteger(CmnConst.PAGESIZE), fs.getInteger(CmnConst.CPAGE));
        dt.getMeta().addAliasTable("product_oa_cooperates", "lc");
        dt.getMeta().addAliasTable("product_oa_cooperate_flow_node", "lcn");
src/main/java/com/product/administration/service/GoOutApplicationService.java
@@ -74,7 +74,7 @@
        if(StringUtils.isEmpty(fs.getString(CmnConst.UUID))){
            fs.setValue(CmnConst.ORG_LEVEL_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//公司
            fs.setValue("applicant", SpringMVCContextHolder.getCurrentUser().getUser_id());//申请人员
            fs.setValue(CmnConst.DEPT_UUID, SpringMVCContextHolder.getCurrentUser().getOrg_level_uuid());//申请部门
            fs.setValue(CmnConst.DEPT_UUID, SpringMVCContextHolder.getCurrentUser().getDept_uuid());//申请部门
            fs.setValue(CmnConst.CREATED_BY,SpringMVCContextHolder.getCurrentUser().getUser_id());
            fs.setValue(CmnConst.CREATED_UTC_DATETIME,new Date());
            return baseDao.add(fs);