审批修改，时间倒叙

ZQN

2024-06-25 0a7159370767b04ef9243f18270d155d527691d4

 project-enforce/src/main/java/com/project/enforce/service/impl/EnforceOrderServiceImpl.java

@@ -204,6 +204,9 @@
        validEntityBeforeSave(add);
        List<String> phones = getCheckPhones(add.getCheckLevel(), add.getApplyDeptId());
        if (StringUtils.isNotEmpty(phones)){
            int checkLevel = Integer.parseInt(phones.get(0));
            add.setCheckLevel(checkLevel);
            phones.remove(0);
            String checkPhones = StringUtils.join(phones, ",");
            add.setCheckIds(checkPhones);
        }
@@ -260,7 +263,7 @@
    @Override
    public List<String> getCheckPhones(Integer checkLevel, Long applyDeptId)
    {
        return getCheckPhones(checkLevel, applyDeptId, 0);
        return getCheckPhonesSimple(checkLevel, applyDeptId);
    }

    @Override
@@ -479,24 +482,19 @@
     * @param checkLevel  审批级别：默认0
     * @param deptId  申请部门id
     */
    private List<String> getCheckPhones(Integer checkLevel, Long deptId, int current)
    private List<String> getCheckPhonesSimple(Integer checkLevel, Long deptId)
    {
        if (checkLevel==3){
            if (current==1){
                return null;
            }
            checkLevel = 0;
            deptId = deptService.selectDeptById(deptId).getParentId();
            current++;
            getCheckPhones(checkLevel, deptId, current);
            return null;
        }
        checkLevel++;
        String checkKey = "check_enforce_";
        List<String> phones = userService.getPhonesByRoleKey(checkKey + checkLevel, deptId);
        if (StringUtils.isNotEmpty(phones)){
            phones.add(0,checkLevel.toString());
            return phones;
        }
        return getCheckPhones(checkLevel, deptId, current);
        return getCheckPhonesSimple(checkLevel, deptId);
    }