|
@@ -22,7 +22,6 @@ import com.care.common.util.DateUtils;
|
|
|
|
|
|
import com.care.common.util.HttpUtil;
|
|
|
import com.care.common.util.ImgUtil;
|
|
|
-import com.care.common.util.Result;
|
|
|
import com.care.common.vo.org.OrganizationVO;
|
|
|
import com.care.common.vo.PageReqVO;
|
|
|
import com.care.common.vo.UserLogindConvertVO;
|
|
@@ -39,9 +38,7 @@ import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
-import java.io.File;
|
|
|
import java.io.FileOutputStream;
|
|
|
-import java.io.IOException;
|
|
|
import java.util.*;
|
|
|
|
|
|
|
|
@@ -138,7 +135,8 @@ public class OrganizationService {
|
|
|
OrganizationVO vo = new OrganizationVO();
|
|
|
CareOrganization organizationInfo = this.careOrganizationService.getById(organizationId);
|
|
|
BeanUtil.copyProperties(organizationInfo,vo);
|
|
|
- //服务有效期
|
|
|
+
|
|
|
+ //机构账号
|
|
|
QueryWrapper<CareSysUser> queryWrapper2 = new QueryWrapper<>();
|
|
|
queryWrapper2.lambda().eq(CareSysUser::getOrgId, organizationId).eq(CareSysUser::getRole,UserRoleEnum.ORG);
|
|
|
CareSysUser careSysUser = this.careSysUserService.getOne(queryWrapper2);
|