kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -287,7 +287,7 @@ //包含共享的数据 userProductDetail.setProductOrderJoinDetailListShare(productOrderDetailList.stream().filter(f -> f.getIsShare()).collect(Collectors.toList())); //科室私有的数据 userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && f.getIsShare() == false)).collect(Collectors.toList())); userProductDetail.setProductOrderJoinDetailsListDep(productOrderDetailList.stream().filter((f -> departmentId.equals(f.getDepartmentId()) && !f.getIsShare())).collect(Collectors.toList())); return userProductDetail; } return null; kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -799,13 +799,14 @@ sysDictionaries.setCreateUserId(createUserId); sysDictionaries.setCreateUserName(createUserName); dicBool = sysDictionariesService.save(sysDictionaries); if (dicBool) { userRegVo.setDoctorRankId(sysDictionaries.getId()); } } if (dicBool) { userRegVo.setDoctorRankId(sysDictionaries.getId()); //写用户组织关系表 List<SysUserOrg> sysUserOrgList = new ArrayList<SysUserOrg>(); sysUserOrgH.setUserId(sysUser.getId()); sysUserOrgH.setOrgId(organizationHos); sysUserOrgH.setFromLevel(CommonConstant.SYSTEM_ORG_HOS_LEVEL); @@ -834,11 +835,7 @@ sysDoctor.setDoctorType(CommonConstant.H_DOCTOR_TYPE); sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId()); sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername()); if (isReg) { sysDoctor.setDoctorState(false); } else { sysDoctor.setDoctorState(true); } sysDoctor.setDoctorState(!isReg); sysDoctor.setDoctorTel(userRegVo.getMobile()); sysDoctor.setDoctorName(userRegVo.getNickname()); sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId()); kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -199,8 +199,6 @@ }) @GetMapping("/users") public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) { // log.info("租户ID:"+ TenantContextHolder.getTenant()); // log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP)); return appUserService.findUsers(params); } /**