123
This commit is contained in:
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user