|
|
@@ -8,6 +8,7 @@ import com.diagbot.dto.RenewalsInfosDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
import com.diagbot.dto.UserOrgDTO;
|
|
|
import com.diagbot.entity.OpenedProducts;
|
|
|
+import com.diagbot.entity.User;
|
|
|
import com.diagbot.entity.UserRenewals;
|
|
|
import com.diagbot.entity.wrapper.UserRenewalsWrapper;
|
|
|
import com.diagbot.enums.CancelRenewalsEnum;
|
|
|
@@ -93,7 +94,21 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
|
|
|
userRenewalsWrapper.setCancelRenewals(CancelRenewalsEnum.NOT_CANCEL.getKey());
|
|
|
if(StringUtil.isNotBlank(renewalsInfosVO.getOrgName())){
|
|
|
RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(renewalsInfosVO.getOrgName());
|
|
|
+ if(rlist.data.size() == 0){
|
|
|
+ rlist.data.add(-1L);
|
|
|
+ }
|
|
|
userRenewalsWrapper.setUserId(rlist.data);
|
|
|
+ }else{
|
|
|
+ RespDTO<List<User>> userInfiList = userServiceClient.getUserAllInfo();
|
|
|
+ if(userInfiList == null || !"0".equals(userInfiList.code) ) {
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
|
|
|
+ "获取用户和机构信息失败");
|
|
|
+ }
|
|
|
+ List<Long> userIds =new ArrayList<>();
|
|
|
+ for (User user:userInfiList.data) {
|
|
|
+ userIds.add(user.getId());
|
|
|
+ }
|
|
|
+ userRenewalsWrapper.setUserId(userIds);
|
|
|
}
|
|
|
List<RenewalsInfosDTO> list = this.selectUserRenewals(page,userRenewalsWrapper).getRecords();
|
|
|
List<ProductLineDTO> productList =lantoneProductFacade.productLines();
|
wangyu