Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java

@@ -108,6 +108,9 @@ public class TaskController {
 //			if(ChkUtil.isNotNull(map)) {
 //				historicTaskInstance.put("assignee", map.get("USR_NAME"));
 //			}
+			if(StringUtils.isNotBlank(one.getId())){
+				historicTaskInstance.put("bpnId",one.getId());
+			}
 			if(ChkUtil.isNull(historicTaskInstance.get("assignee"))) {
 //				ResponseMessage<List<OrgEO>> listUser = lawsUserInfoService.getManagerByOrgIdNew("企业标准管理工程师");
 				ResponseMessage<List<OrgEO>> listUser = new ResponseMessage<>();

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -22,7 +22,7 @@ import java.util.Set;
 @Component
 //@FeignClient(value = "FotonLAWSSystem-qk",path="/api",url="")
 //线上部署用
-@FeignClient(value = "FotonLAWSSystem",path="/api",url="")
+@FeignClient(value = "FotonLAWSSystem-test",path="/api",url="")
 @RequestMapping("/")
 public interface LawsUserInfoService {