关于上级机构的冲突性测试bug修复

    @RequiresPermissions("sys:office:edit")
    @RequestMapping(value = "save")
    public String save(Office office, Model model, RedirectAttributes redirectAttributes) {      
        if(Global.isDemoMode()){
            addMessage(redirectAttributes, "演示模式，不允许操作！");
            return "redirect:" + adminPath + "/sys/office/";}
        if (!beanValidator(model, office)){
            return form(office, model);
        }
        if("".equals(office.getParent().getName())){
            officeService.save(office);        
            if(office.getChildDeptList()!=null){
                Office childOffice = null;
                for(String id : office.getChildDeptList()){
                    childOffice = new Office();
                    childOffice.setName(DictUtils.getDictLabel(id, "sys_office_common", "未知"));
                    childOffice.setParent(office);
                    childOffice.setArea(office.getArea());
                    childOffice.setType("2");
                    childOffice.setGrade(String.valueOf(Integer.valueOf(office.getGrade())+1));
                    childOffice.setUseable(Global.YES);
                    officeService.save(childOffice);
                }
            }        
            addMessage(redirectAttributes, "保存机构‘" + office.getName() + "‘成功");    
            }else{    
//        if(!("".equals(office.getParent().getName()))){//添加下级机构
            int m = officeService.findByParentId(office.getParent().getName());
            if(m==0){
                addMessage(redirectAttributes, "保存失败，请检查机构是否存在，再重试！" );
            }else{        
            officeService.save(office);        
            if(office.getChildDeptList()!=null){
                Office childOffice = null;
                for(String id : office.getChildDeptList()){
                    childOffice = new Office();
                    childOffice.setName(DictUtils.getDictLabel(id, "sys_office_common", "未知"));
                    childOffice.setParent(office);
                    childOffice.setArea(office.getArea());
                    childOffice.setType("2"); 
                    childOffice.setGrade(String.valueOf(Integer.valueOf(office.getGrade())+1));
                    childOffice.setUseable(Global.YES);
                    officeService.save(childOffice);
                }
            }        
            addMessage(redirectAttributes, "保存机构‘" + office.getName() + "‘成功");    
            }
            }
        String id = "0".equals(office.getParentId()) ? "" : office.getParentId();        
        return "redirect:" + adminPath + "/sys/office/forlist?id="+id+"&parentIds="+office.getParentIds();
        }