This commit is contained in:
张良(004796)
2024-01-02 17:09:58 +08:00
parent 2c68510a02
commit c3b9c761af
5 changed files with 20 additions and 3 deletions

View File

@@ -17,6 +17,7 @@ import com.ruoyi.cai.dto.app.vo.DynamicVo;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.mapper.DynamicMapper;
import com.ruoyi.cai.service.CitysService;
import com.ruoyi.cai.service.DynamicImagesService;
import com.ruoyi.cai.service.DynamicService;
import com.ruoyi.cai.service.UserService;
@@ -49,11 +50,12 @@ public class DynamicServiceImpl extends ServiceImpl<DynamicMapper, Dynamic> impl
private UserService userService;
@Autowired
private SystemConfigManager systemConfigManager;
@Autowired
private CitysService citysService;
@Override
public List<String> selectDynamicImageList(Long userId, Integer limit) {
List<String> res = baseMapper.selectDynamicImageList(userId,limit);
return res;
return baseMapper.selectDynamicImageList(userId,limit);
}
@Override
@@ -91,6 +93,12 @@ public class DynamicServiceImpl extends ServiceImpl<DynamicMapper, Dynamic> impl
}
}
Dynamic dynamic = BeanConvertUtil.convertTo(res, Dynamic::new);
if(dynamic.getCityId() == null || dynamic.getCityId() == 0){
dynamic.setCityId(user.getCityId());
dynamic.setCity(user.getCity());
} else {
dynamic.setCity(citysService.getByCityId(dynamic.getCityId()));
}
if(CollectionUtil.isNotEmpty(res.getImageList())){
dynamic.setIsAttach(1);
}else{