Merge remote-tracking branch 'origin/master'

zhangherong

10 天以前 3661612cc6c99bccf0fb6a212d22c51ee7841c6e

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentLeanOutServiceImpl.java

@@ -136,9 +136,9 @@
        if (StringUtils.isBlank(request.getLeanDepartId())) {
            throw new JeecgBootException("借入车间不允许为空！");
        }
        if (request.getLeanDepartId().equals(equipment.getOrgId())) {
            throw new JeecgBootException("当前设备属于此车间，不需要借用！");
        }
//        if (request.getLeanDepartId().equals(equipment.getOrgId())) {
//            throw new JeecgBootException("当前设备属于此车间，不需要借用！");
//        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法添加借用记录！");
@@ -168,9 +168,9 @@
        if (StringUtils.isBlank(request.getLeanDepartId())) {
            throw new JeecgBootException("借入车间不允许为空！");
        }
        if (request.getLeanDepartId().equals(equipment.getOrgId())) {
            throw new JeecgBootException("当前设备属于此车间，不需要借用！");
        }
//        if (request.getLeanDepartId().equals(equipment.getOrgId())) {
//            throw new JeecgBootException("当前设备属于此车间，不需要借用！");
//        }
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
            throw new JeecgBootException("当前用户无法编辑借用记录！");
@@ -230,7 +230,7 @@
        }
        variables.put("proofreading", true);
        List<String> usernames = new ArrayList<>();
        usernames.add(equipment.getEquipmentManager());
//        usernames.add(equipment.getEquipmentManager());
        variables.put("NextAssignee", usernames);
        Result result = flowDefinitionService.startProcessInstanceByKey("equipment_lean_out", variables);
        if (result != null) {
@@ -312,15 +312,15 @@
                break;
            // 归还
            case WAIT_RETURN:
                if (StringUtils.isBlank(equipment.getEquipmentManager())) {
                    throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
                }
                List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
                userApprovalList.add(equipment.getEquipmentManager());
//                if (StringUtils.isBlank(equipment.getEquipmentManager())) {
//                    throw new JeecgBootException("设备未分配设备管理员，无法进入下级审批！");
//                }
//                List<String> userApprovalList = new ArrayList<>(Collections.singletonList(entity.getLeanPerson()));
//                userApprovalList.add(equipment.getEquipmentManager());
                values.put("dataId", entity.getId());
                values.put("organization", request.getReturnComment());
                values.put("comment", request.getReturnComment());
                values.put("NextAssignee", userApprovalList);
//                values.put("NextAssignee", userApprovalList);
                request.setComment(request.getReturnComment());
                entity.setLeanEndTime(new Date()); //归还时间
                //设置entity