|
@@ -47,10 +47,13 @@ public class TXiangmuController {
|
|
|
*/
|
|
|
@RequestMapping(value = "wx/getAll", method = RequestMethod.POST)
|
|
|
@ApiOperation("获取所有项目")
|
|
|
- public R<List<TXiangmu>> geTXiangmu(TXiangmu tXiangmu) {
|
|
|
+ public R<List<TXiangmu>> geTXiangmu(@RequestBody TXiangmu tXiangmu) {
|
|
|
LambdaQueryWrapper<TXiangmu> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(tXiangmu.getcId()), TXiangmu::getcId, tXiangmu.getcId()).
|
|
|
- orderByDesc(TXiangmu::getDtCreateTime);
|
|
|
+ objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(tXiangmu.getcId()), TXiangmu::getcId, tXiangmu.getcId());
|
|
|
+ if(StringUtils.isNotBlank(tXiangmu.getcLdList())){
|
|
|
+ objectLambdaQueryWrapper.apply("FIND_IN_SET({0}, c_ld_list)", tXiangmu.getcLdList());
|
|
|
+ }
|
|
|
+ objectLambdaQueryWrapper.orderByDesc(TXiangmu::getDtCreateTime);
|
|
|
List<TXiangmu> list = xiangmuService.list(objectLambdaQueryWrapper);
|
|
|
return R.ok(list);
|
|
|
}
|