浏览代码

培训的权限

wuwen 5 年之前
父节点
当前提交
de11e9509e

+ 4 - 0
src/main/java/com/ssj/dao/sys/train/dao/impl/TrainQueryDaoImpl.java

@@ -61,6 +61,10 @@ public class TrainQueryDaoImpl  implements TrainQueryDao {
        	 	sb.append(" AND t.unit_name like concat('%',?,'%') ");
        	 	param.add(params.get("unitName"));
         }
+        if(params.get("id")!=null && StringUtils.isNotEmpty(params.get("id").toString())) {
+       	 	sb.append(" AND t.id=? ");
+       	 	param.add(params.get("id"));
+        }
         sb.append(" ORDER BY t.create_time desc ");
         return dao.findPage(sb.toString(),param.toArray(),pageable);
 	}

+ 13 - 3
src/main/java/com/ssj/sys/controller/TrainController.java

@@ -7,7 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,12 +20,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.ssj.bean.common.framework.core.domain.Response;
+import com.ssj.bean.sys.fx.domain.Merchant;
+import com.ssj.bean.sys.role.domain.Admin;
 import com.ssj.bean.sys.train.bean.ExamInfo;
 import com.ssj.bean.sys.train.bean.VideoFile;
 import com.ssj.bean.sys.train.bean.VideoInfo;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.core.common.controller.BaseController;
-import com.ssj.framework.core.util.ResponseEntity;
+import com.ssj.service.sys.fx.service.MerchantService;
 import com.ssj.service.sys.train.service.ExamInfoService;
 import com.ssj.service.sys.train.service.VideoFileService;
 import com.ssj.service.sys.train.service.VideoInfoService;
@@ -47,6 +49,9 @@ public class TrainController extends BaseController {
 	@Autowired
 	private VideoUserService videoUserService;
 	
+	@Autowired
+	private MerchantService merchantService;
+	
 	@RequestMapping("/video/list")
 	public String videoList(Model model,
 			@RequestParam(required = false, defaultValue = "10") int pageSize,
@@ -142,8 +147,13 @@ public class TrainController extends BaseController {
 			@RequestParam(required = false, defaultValue = "1") int pageNo)
 			throws Exception { 
 		
+		HttpSession session = request.getSession();
+		Admin admin =(Admin) session.getAttribute("admin");
+		Merchant merchant=merchantService.getMerchantByPosCode(admin.getLoginName());
+		
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("unitName", request.getParameter("unitName")==null?"":request.getParameter("unitName"));
+		params.put("id",merchant!=null ? merchant.getId() : "无权限");
 		
 		SplitPage sp = new SplitPage();
         sp.setAction(request.getRequestURI());
@@ -162,7 +172,7 @@ public class TrainController extends BaseController {
         model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
         model.addAttribute("page", sp);
         model.addAttribute("search", params);
-
+		
 		return "sys/train/pace_list";
 	}