周伟鹏 / cnlive_shenhe · Commits

Commit 7f109066aa56ffd14a08505a819575101dbf9af8

Authored by 徐近程
2 parents 8f2d77e4 c7f73a9b

Merge branch 'dev'

Inline Side-by-side
Showing 2 changed files with 5 additions and 19 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @7f10906
... ... @@ -292,19 +292,12 @@ public class VideosController extends BaseController {
292 292 * @param response
293 293 */
294 294 @GetMapping("excel")
295   - public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String sp_Id,Integer source,String video_user_id,String sp_desc,String orderByClause, HttpSession session, HttpServletResponse response) {
  295 + public void getExcel(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, Integer source,String video_user_id,String orderByClause, HttpSession session, HttpServletResponse response) {
296 296 SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
297 297 Integer spid = sessionUser.getSpid();
298 298 String userId = sessionUser.getUserId();
299   - if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
300   - ShySites shySite = sitesService.findspidBySpdesc(sp_desc);
301   - if (CommonUtils.isNotNull(shySite)) {
302   - spid = shySite.getSpid();
303   - }
304   - } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
305   - spid = null;
306   - }
307   - List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId,sp_Id, source, video_user_id);
  299 + if (spid == 0) spid = null;
  300 + List<ShyVideos> shyVideosList = videosService.findByCondition(video_title, start_date, end_date, state, receive, video_priority, orderByClause, spid, userId, source, video_user_id);
308 301 String fileName = "点播数据";
309 302 String updater = "";//审核员名字
310 303 String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @7f10906
... ... @@ -265,7 +265,7 @@ public class VideosServiceImpl {
265 265 * @param userId
266 266 * @return
267 267 */
268   - public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,Integer source,String video_user_id) {
  268 + public List<ShyVideos> findByCondition(String video_title, String start_date, String end_date, Integer state, Integer receive, String video_priority, String orderByClause, Integer spid, String userId,Integer source,String video_user_id) {
269 269 Example example = new Example(ShyVideos.class);
270 270 Example.Criteria criteria = example.createCriteria();
271 271 Example.Criteria criteria2 = example.createCriteria();
... ... @@ -299,10 +299,7 @@ public class VideosServiceImpl {
299 299 if (CommonUtils.isNotEmpty(video_priority)) {
300 300 criteria.andEqualTo("video_priority", video_priority);
301 301 }
302   - if (CommonUtils.isNotNull(spid)) {
303   - criteria.andEqualTo("spid", spid);
304   - }
305   - if (CommonUtils.isNotNull(video_user_id)) {
  302 + if (CommonUtils.isNotEmpty(video_user_id)) {
306 303 criteria.andEqualTo("video_user_id", video_user_id);
307 304 }
308 305  
... ... @@ -312,12 +309,8 @@ public class VideosServiceImpl {
312 309  
313 310 if (CommonUtils.isNotNull(spid)) {
314 311 criteria.andEqualTo("spid", spid);
315   - } else if(CommonUtils.isNotEmpty(sp_Id)) {
316   - criteria.andEqualTo("spid", sp_Id);
317 312 }
318 313  
319   -
320   -
321 314 if (CommonUtils.isNotNull(receive)) {
322 315 criteria.andEqualTo("receive", receive);
323 316 if (receive == CommonConst.RECEIVE_AFTER) {
... ...