Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmInitiatedProvider.java

@@ -1,28 +1,6 @@
 package com.lc.ibps.office.provider;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.function.Function;
-
-import javax.annotation.Resource;
-
 import com.alibaba.fastjson.JSONObject;
-import com.lc.ibps.base.core.util.Collections;
-import com.lc.ibps.base.framework.table.ICommonDao;
-import com.lc.ibps.bpmn.service.impl.BpmProcInstServiceImpl;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.event.Level;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.jd.platform.async.executor.Async;
 import com.jd.platform.async.wrapper.WorkerWrapper;
 import com.lc.ibps.api.base.constants.StateEnum;
@@ -33,6 +11,7 @@ import com.lc.ibps.base.core.exception.BaseException;
 import com.lc.ibps.base.core.monitor.StopWatchUtil;
 import com.lc.ibps.base.core.util.AppUtil;
 import com.lc.ibps.base.core.util.BeanUtils;
+import com.lc.ibps.base.core.util.Collections;
 import com.lc.ibps.base.core.util.I18nUtil;
 import com.lc.ibps.base.db.mybatis.Dialect;
 import com.lc.ibps.base.db.tenant.exception.TenantException;
@@ -42,6 +21,7 @@ import com.lc.ibps.base.framework.executor.ICalculateThreadSize;
 import com.lc.ibps.base.framework.executor.MultiTaskExecutor;
 import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.base.framework.request.signature.annotation.Signature;
+import com.lc.ibps.base.framework.table.ICommonDao;
 import com.lc.ibps.base.saas.context.TenantContext;
 import com.lc.ibps.base.web.context.ContextUtil;
 import com.lc.ibps.bpmn.api.constant.BpmAuthContants;
@@ -66,12 +46,24 @@ import com.lc.ibps.office.api.IBpmInitiatedService;
 import com.lc.ibps.office.api.IBpmReceivedService;
 import com.lc.ibps.office.jd.entity.DashboardEntity;
 import com.lc.ibps.office.jd.worker.DashboardWorker;
+import io.swagger.annotations.*;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Extension;
-import io.swagger.annotations.ExtensionProperty;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Function;
 
 /**
  * 个人办公-流程中心 控制类
@@ -1574,7 +1566,8 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 								"WHERE DATE(create_time_) = CURDATE()  \n" +
 								"  AND shi_fou_guo_shen_ = '待处理'\n" +
 								"  AND (\n" +
-								"      (ke_tui_song_ren_ LIKE '%"+currentUserId+"%')\n" +
+								"      ((ke_tui_song_ren_ LIKE '%"+currentUserId+"%')\n" +
+								"        AND FIND_IN_SET(bian_zhi_bu_men_, '"+positions+"'))"+
 								"      OR\n" +
 								"      ((ke_tui_song_ren_ IS NULL OR ke_tui_song_ren_ = '') \n" +
 								"       AND FIND_IN_SET(bian_zhi_bu_men_, '"+positions+"')))";