1098226878
2021-08-26 954e5ef7357a70acb7a44fc585d9be9d9c25a65b
Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
2个文件已修改
24 ■■■■■ 已修改文件
service-common/src/main/java/com/java110/common/activity/resourceEnter/ResourceEnterToDepartmentListener.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/activity/resourceEnter/ResourceEnterToDepartmentListener.java
@@ -20,29 +20,7 @@
    public void notify(DelegateTask delegateTask) {
        logger.info("查询部门审核人员");
//        auditUserInnerServiceSMOImpl = ApplicationContextFactory.getBean("auditUserInnerServiceSMOImpl", IAuditUserInnerServiceSMO.class);
//        AuditUserDto auditUserDto = new AuditUserDto();
//        PurchaseApplyDto purchaseApplyDto = (PurchaseApplyDto)delegateTask.getVariable("purchaseApplyDto");
        String nextAuditStaffId = delegateTask.getVariable("nextAuditStaffId").toString();
        /*auditUserDto.setStoreId(purchaseApplyDto.getStoreId());
        auditUserDto.setObjCode("resourceEntry");
        auditUserDto.setAuditLink("809001");
        List<AuditUserDto> auditUserDtos = auditUserInnerServiceSMOImpl.queryAuditUsers(auditUserDto);
        for (AuditUserDto tmpAuditUser : auditUserDtos) {
            AuditUser auditUser = BeanConvertUtil.covertBean(tmpAuditUser, AuditUser.class);
            logger.info("查询到用户:"+tmpAuditUser.getUserName());
            delegateTask.setVariable(auditUser.getUserId(), auditUser);
        }
        logger.info("查询审核人员人数:"+auditUserDtos.size());
        if (auditUserDtos == null || auditUserDtos.size() < 1) {
            return;
        }*/
        delegateTask.setAssignee(nextAuditStaffId);
        logger.info("设置部门审核人员:"+nextAuditStaffId);
service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java
@@ -410,7 +410,7 @@
        for (Element userTask : userTasks) {
            Attribute assignee = userTask.attribute("assignee");
            if (assignee == null) {
                userTask.addAttribute("camunda:assignee", "${nextUserId}");
                userTask.addAttribute("assignee", "${nextUserId}");
            }
        }