|
|
|
@@ -8,6 +8,7 @@ import com.iformall.service.MallUserActionService; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -27,7 +28,13 @@ public class MallUserActionController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData list(@ModelAttribute MallUserActionVo userAction, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserActionController::list"); |
|
|
|
if (null == userAction) userAction = new MallUserActionVo(); |
|
|
|
if (null == userAction) { |
|
|
|
userAction = new MallUserActionVo(); |
|
|
|
} else { |
|
|
|
if(StringUtils.isBlank(userAction.getName())) { |
|
|
|
userAction.setName(null); |
|
|
|
} |
|
|
|
} |
|
|
|
final PageInfo<MallUserActionVo> page = mallUserActionService.listAsPage(userAction, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|