FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-08-10 17:00:40 +08:00
parent 49047c5a84 9f03861324
commit 6b7b735e13
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+3
View File
@@ -108,6 +108,9 @@ public class TaskController {
// if(ChkUtil.isNotNull(map)) { // if(ChkUtil.isNotNull(map)) {
// historicTaskInstance.put("assignee", map.get("USR_NAME")); // historicTaskInstance.put("assignee", map.get("USR_NAME"));
// } // }
if(StringUtils.isNotBlank(one.getId())){
historicTaskInstance.put("bpnId",one.getId());
}
if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) { if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) {
// ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师"); // ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
ResponseMessage<List<OrgEO>> listUser = new ResponseMessage<>(); ResponseMessage<List<OrgEO>> listUser = new ResponseMessage<>();
src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java
+1 -1
View File
@@ -22,7 +22,7 @@ import java.util.Set;
@Component @Component
//@FeignClient(value = "FotonLAWSSystem-qk",path="/api",url="") //@FeignClient(value = "FotonLAWSSystem-qk",path="/api",url="")
//线上部署用 //线上部署用
@FeignClient(value = "FotonLAWSSystem",path="/api",url="") @FeignClient(value = "FotonLAWSSystem-test",path="/api",url="")
@RequestMapping("/") @RequestMapping("/")
public interface LawsUserInfoService { public interface LawsUserInfoService {