product-server-administration
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
许鹏程
2023-08-22 c904bb22a132d75cb7f717d5a725b9624bdcf68e 
 src/main/java/com/product/administration/service/CooperatesService.java


@@ -1,15 +1,12 @@


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;


import com.product.administration.service.ide.ICooperatesService;


import com.product.common.lang.StringUtils;


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;


@@ -18,9 +15,9 @@


import com.product.core.spring.context.SpringMVCContextHolder;


import com.product.core.transfer.Transactional;


import com.product.core.websocket.service.WebsocketMesssageServiceThread;


import com.product.module.sys.service.UserService;


import com.product.util.BaseUtil;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Qualifier;


import org.springframework.stereotype.Component;


import com.product.tool.flow.service.FlowCoordinationService;




@@ -49,7 +46,6 @@


   @Autowired


   QueryFilterService queryFilterService;


   @Autowired


   @Qualifier("userOperService")


   UserService userService;




   /**


@@ -321,7 +317,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");