flowable修改

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -810,4 +810,32 @@ public class  FlowableController extends BaseController
         PubApprovalProcess approvalProcesses = approvalProcessService.getById(papId);
         return AjaxResult.success(approvalProcesses);
     }
+
+
+    @PostMapping(value = "/getUserInfoByCompanyId")
+    public AjaxResult getUserInfoByCompanyId(
+            @RequestParam(value = "companyId") String companyId
+        ){
+        LambdaQueryWrapper<SysUserCompanyRel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SysUserCompanyRel::getSucrCompanyId, companyId);
+        List<SysUserCompanyRel> userCompanyRelList = iSysUserCompanyRelService.findSysUserCompanyRels(lambdaQueryWrapper);
+        if (userCompanyRelList.size() == 0) {
+            return AjaxResult.success();
+        }
+        List<Long> userIdList = new ArrayList<>();
+        for (SysUserCompanyRel rel : userCompanyRelList) {
+            userIdList.add(rel.getSucrUserId());
+        }
+        LambdaQueryWrapper<SysUser> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.in(SysUser::getUserId, userIdList);
+        List<SysUser> userList = iSysUserService.findSysUsers(lambdaQueryWrapper1);
+        List<Map<String, String>> resList = new ArrayList<>();
+        for (SysUser user : userList) {
+            Map<String, String> u = new HashMap<>();
+            u.put("id", user.getUserId().toString());
+            u.put("displayName", user.getNickName());
+            resList.add(u);
+        }
+        return AjaxResult.success(resList);
+    }
 }

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -66,7 +66,7 @@ public class ApprovalServiceImpl implements ApprovalService {
      */
     @Override
     public void coreApproval(@RequestBody Map map) throws Exception {
-        Map<String, Object> flowParam = new HashMap<String, Object>();
+        Map<String, Object> flowParam = new HashMap<>();
         //融信Id
         String zfiId = CommonUtil.objToString(map.get("zfiId"));
         //融信编号
@@ -94,6 +94,8 @@ public class ApprovalServiceImpl implements ApprovalService {
         if (!CommonUtil.isEmpty(scyName)){
             flowParam.put("name",scyName + "在" + DateUtils.getDate() + "发起融信开立审批");
         }
+        map.remove("ticketList");
+        map.put("createBy", user.getUserid());
         JSONObject jsonObj = new JSONObject(map);
         flowParam.put("paras", jsonObj.toString());
         Map<String, Object> resMap = flowableService.apiPost(STRART_FLOW, flowParam);