kangwei:

      1、题库管理不做数据权限过滤
       3、试题管理展示提交人、所属机构、提交时间
       4、试卷管理时，选择题库不做数据权限过滤

@@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.edu.service.IQuestionService;
 import com.skua.modules.edu.service.IQuestionService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -115,6 +116,12 @@ public class QuestionDBController {
 	public Result<QuestionDB> add(@RequestBody QuestionDB questionDB) {
 	public Result<QuestionDB> add(@RequestBody QuestionDB questionDB) {
 		Result<QuestionDB> result = new Result<QuestionDB>();
 		Result<QuestionDB> result = new Result<QuestionDB>();
 		try {
 		try {
+			if(StringUtils.isEmpty(questionDB.getUserId())){
+				questionDB.setUserId(BaseContextHandler.getUserId());
+			}
+			if(StringUtils.isEmpty(questionDB.getDepartId())){
+				questionDB.setDepartId(BaseContextHandler.getRealDepartId());
+			}
 			questionDBService.save(questionDB);
 			questionDBService.save(questionDB);
 			result.success("添加成功！");
 			result.success("添加成功！");
 		} catch (Exception e) {
 		} catch (Exception e) {

@@ -25,7 +25,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 @Accessors(chain = true)
 @Accessors(chain = true)
 @ApiModel(value="edu_question_db对象", description="在线考试-题库")
 @ApiModel(value="edu_question_db对象", description="在线考试-题库")
 public class QuestionDB {
 public class QuestionDB {
-    
+
 	/**主键*/
 	/**主键*/
 	@TableId(type = IdType.ID_WORKER_STR)
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "主键")
     @ApiModelProperty(value = "主键")
@@ -35,9 +35,10 @@ public class QuestionDB {
     @ApiModelProperty(value = "厂id")
     @ApiModelProperty(value = "厂id")
 	@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
 	@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
 	private String departId;
 	private String departId;
-	/**创建人编号*/
-	@Excel(name = "创建人编号", width = 15)
-    @ApiModelProperty(value = "创建人编号")
+	/**提交人编号*/
+	@Excel(name = "提交人编号", width = 15)
+    @ApiModelProperty(value = "提交人编号")
+	@Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
 	private String userId;
 	private String userId;
 	/**父机构ID*/
 	/**父机构ID*/
 	@Excel(name = "父机构ID", width = 15)
 	@Excel(name = "父机构ID", width = 15)

@@ -23,8 +23,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.skua.modules.safe.service.IDangerLevelManageShareService;
 import com.skua.modules.safe.service.IDangerLevelManageShareService;
+import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.mapper.SysConfigMapper;
 import com.skua.modules.system.mapper.SysConfigMapper;
 import com.skua.modules.system.service.ISysConfigService;
 import com.skua.modules.system.service.ISysConfigService;
+import com.skua.modules.system.service.ISysDepartService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -62,6 +64,9 @@ public class DangerLevelManageController {
 	 private String webUrl;
 	 private String webUrl;
 	 @Autowired
 	 @Autowired
 	 private ISysConfigService configService;
 	 private ISysConfigService configService;
+
+	 @Autowired
+	 private ISysDepartService departService;
 	/**
 	/**
 	  * 分页列表查询
 	  * 分页列表查询
 	 * @param dangerLevelManage
 	 * @param dangerLevelManage
@@ -96,8 +101,21 @@ public class DangerLevelManageController {
 																HttpServletRequest req) {
 																HttpServletRequest req) {
 		 Result<IPage<DangerLevelManageShare>> result = new Result<IPage<DangerLevelManageShare>>();
 		 Result<IPage<DangerLevelManageShare>> result = new Result<IPage<DangerLevelManageShare>>();
 		 QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
 		 QueryWrapper<DangerLevelManageShare> queryWrapper = QueryGenerator.initQueryWrapper(dangerLevelManage, req.getParameterMap());
-		 Page<DangerLevelManageShare> page = new Page<DangerLevelManageShare>(pageNo, pageSize);
+		 Page<DangerLevelManageShare> page = new Page<>(pageNo, pageSize);
 		 IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper);
 		 IPage<DangerLevelManageShare> pageList = dangerLevelManageShareService.page(page, queryWrapper);
+
+	/*	 List<SysDepart> sysDepartList = departService.queryList();
+		 if(pageList.getRecords() != null && !pageList.getRecords().isEmpty()){
+		 	for( DangerLevelManageShare shareVO: pageList.getRecords()){
+				if(shareVO.getDepartId() != null ){
+					for(  sysDepartList){
+
+					}
+				}
+			}
+
+		 }*/
+
 		 result.setSuccess(true);
 		 result.setSuccess(true);
 		 result.setResult(pageList);
 		 result.setResult(pageList);
 		 return result;
 		 return result;

@@ -86,8 +86,10 @@ public class MybatisInterceptor implements Interceptor {
         //巡检触发方式卡片配置
         //巡检触发方式卡片配置
         add("inspection_point_trigger_config");
         add("inspection_point_trigger_config");
 
 
-        //用户试卷
-        add("edu_user_paper");
+        //在线考试
+        add("edu_user_paper");//用户的试卷
+        add("edu_question");//试题
+        add("edu_question_db");//题库
         //采购药剂物料
         //采购药剂物料
         add("erp_purchase_plan_item");
         add("erp_purchase_plan_item");
         add("erp_purchase_material");
         add("erp_purchase_material");