forked from kidgrow-microservices-platform

zhaoxiaohao
2020-08-12 3dcb4e0ebfd43190957f556d886917b2a2ffa064
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -68,7 +68,17 @@
        } else {
            if (sysUserOrg.getUserId() != null) {
                String createUserOrgCode = "";
                List<SysOrganization> userOrgData = sysUser.getOrganizations();
                List<SysOrganization> userOrgData = new ArrayList<>();
                SysOrganization byId = sysOrganizationService.getById(sysUserOrg.getOrgId());
                if(byId==null){
                    return ResultBody.failed().data(null).msg("该组织id异常");
                }
                SysOrganization parentId = sysOrganizationService.getById(byId.getOrgParentId());
                userOrgData.add(parentId);
                userOrgData.add(byId);
                if(parentId==null){
                    return ResultBody.failed().data(null).msg("该组织id异常");
                }
                if (userOrgData != null) {
                    if (userOrgData.size() == 2) {
                        createUserOrgCode = userOrgData.get(1).getOrgCode();
@@ -86,23 +96,21 @@
                                userOrgList.get(i).setFromLevel(2);
                                //查询  科室
                                QueryWrapper queryWrapper=new QueryWrapper();
                                queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("is_del",0);
                                queryWrapper.eq("enabled",1);
                                QueryWrapper queryWrapper = new QueryWrapper();
                                queryWrapper.eq("org_id", sysUserOrg.getOrgId());
                                queryWrapper.eq("is_del", 0);
                                queryWrapper.eq("enabled", 1);
                                List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
                                if(!list.isEmpty()){
                                if (!list.isEmpty()) {
                                    userOrgList.get(i).setFromId(list.get(0).getId());
                                }else {
                                } else {
                                    userOrgList.get(i).setFromId(null);
                                }
                            }
                            else
                            {
                                QueryWrapper queryWrapper=new QueryWrapper();
                                queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("is_del",0);
                                queryWrapper.eq("enabled",1);
                            } else {
                                QueryWrapper queryWrapper = new QueryWrapper();
                                queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("is_del", 0);
                                queryWrapper.eq("enabled", 1);
                                List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
                                if (!listHospital.isEmpty()) {
                                    userOrgList.get(i).setFromId(listHospital.get(0).getId());
@@ -127,20 +135,20 @@
                            sysUserOrgTemp.setFromLevel(2);
                            //查询  科室
                            QueryWrapper queryWrapper=new QueryWrapper();
                            queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                            queryWrapper.eq("is_del",0);
                            queryWrapper.eq("enabled",1);
                            QueryWrapper queryWrapper = new QueryWrapper();
                            queryWrapper.eq("org_id", sysUserOrg.getOrgId());
                            queryWrapper.eq("is_del", 0);
                            queryWrapper.eq("enabled", 1);
                            List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
                            if(!list.isEmpty()){
                            if (!list.isEmpty()) {
                                sysUserOrgTemp.setFromId(list.get(0).getId());
                            }
                            userOrgList.add(sysUserOrgTemp);
                            //查询 医院
                            queryWrapper=new QueryWrapper();
                            queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                            queryWrapper.eq("is_del",0);
                            queryWrapper.eq("enabled",1);
                            queryWrapper = new QueryWrapper();
                            queryWrapper.eq("org_id", sysUserOrg.getUpdateUserId());
                            queryWrapper.eq("is_del", 0);
                            queryWrapper.eq("enabled", 1);
                            List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
                            if (!listHospital.isEmpty()) {
                                sysUserOrgTemp.setFromId(listHospital.get(0).getId());