修改专项任务和来函权限按钮展示以及列表展示权限用户下的数据

修改特定服务bug

src/main/java/com/nis/web/controller/basics/TaskInfoController.java

@@ -31,7 +31,7 @@ public class TaskInfoController extends BaseController{
 	 */
 	@RequestMapping(value = {"list",""})
 	public String list(TaskInfo taskInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<TaskInfo> page = taskInfoService.findTaskInfo(new Page<TaskInfo>(request, response), taskInfo);
+		Page<TaskInfo> page = taskInfoService.findTaskInfo(new Page<TaskInfo>(request, response,"r"), taskInfo);
         model.addAttribute("page", page);
         return "/basics/taskInfoList";
 	}
@@ -76,7 +76,7 @@ public class TaskInfoController extends BaseController{
 		} catch (Exception e) {
 			logger.error(e.getMessage());
 			e.printStackTrace();
-			addMessage(model, "save_failed");
+			addMessage(redirectAttributes, "save_failed");
 		}
 		return "redirect:" + adminPath + "/basics/taskInfo/list?repage";
 	}

src/main/java/com/nis/web/controller/configuration/RequestInfoController.java

@@ -32,7 +32,7 @@ public class RequestInfoController extends BaseController{
 	 */
 	@RequestMapping(value = {"list",""})
 	public String list(RequestInfo requestInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response), requestInfo);
+		Page<RequestInfo> page = requestInfoService.findRequestInfo(new Page<RequestInfo>(request, response,"r"), requestInfo);
         model.addAttribute("page", page);
         return "/cfg/requestList";
 	}

src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java

@@ -53,9 +53,9 @@ public class SpecificServiceCfgController extends BaseController {
 			Model model) {
 		String searchType = null;
 		String searchContent = null;
-		if(specificServiceCfg.getSpecServiceId()!=null){
-			searchType = "specServiceId";
-			searchContent = specificServiceCfg.getSpecServiceId().toString();
+		if(specificServiceCfg.getSpecServiceCode()!=null){
+			searchType = "specServiceCode";
+			searchContent = specificServiceCfg.getSpecServiceCode().toString();
 		}
 		if(!StringUtils.isBlank(specificServiceCfg.getSpecServiceName())){
 			searchType = "specServiceName";

src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml

@@ -47,32 +47,34 @@
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
 	left join task_info t on r.task_id=t.id
-	where r.is_valid!=-1 and r.is_audit !=3
-	<if test="requestTitle != null and requestTitle != ''">
+	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+    	<if test="requestTitle != null and requestTitle != ''">
 			AND r.request_title like 
-				<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
-	</if>
-	<if test="requestContent != null and requestContent != ''">
-			AND r.request_content like 
-				<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
-	</if>
-	<if test="requestNumber != null and requestNumber != ''">
-			AND r.request_number like
-			<if test="dbName == 'mysql'">CONCAT('%',#{requestNumber},'%')</if>
-	</if>
-	<if test="isAudit != null">
-			AND r.is_audit=${isAudit}
-	</if>
-	<if test="isValid != null">
-			AND r.is_valid=${isValid}
-	</if>
-	<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-			AND r.request_time between #{beginDate} and #{endDate}
- 	</if>
-	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND r.edit_time between #{dobeginDate} and #{doendDate}
-	</if>
-	
+			<if test="dbName == 'mysql'">CONCAT('%',#{requestTitle}, '%')</if>
+		</if>
+		<if test="requestContent != null and requestContent != ''">
+				AND r.request_content like 
+					<if test="dbName == 'mysql'">CONCAT('%',#{requestContent},'%')</if>
+		</if>
+		<if test="requestNumber != null and requestNumber != ''">
+				AND r.request_number like
+				<if test="dbName == 'mysql'">CONCAT('%',#{requestNumber},'%')</if>
+		</if>
+		<if test="isAudit != null">
+				AND r.is_audit=${isAudit}
+		</if>
+		<if test="isValid != null">
+				AND r.is_valid=${isValid}
+		</if>
+		<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+				AND r.request_time between #{beginDate} and #{endDate}
+			</if>
+		<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
+				AND r.edit_time between #{dobeginDate} and #{doendDate}
+		</if>
+		<!-- 数据范围过滤 -->
+				${sqlMap.dsf}
+    </trim>
 	<choose>
 		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 			ORDER BY ${page.orderBy}

src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml

@@ -51,20 +51,28 @@
 	left join sys_user s on r.creator_id=s.id
 	left join sys_user u on r.editor_id=u.id
 	left join sys_user e on r.auditor_id=e.id
-	where r.is_valid!=-1 and r.is_audit !=3
-	<if test="taskName != null and taskName != ''">
+	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+    	<if test="page !=null and page.where != null and page.where != ''">
+			 AND ${page.where}
+		</if>
+ 		<if test="taskName != null and taskName != ''">
 			AND r.task_name like 
-				<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
-	</if>
-	<if test="isAudit != null">
-			AND r.is_audit=${isAudit}
-	</if>
-	<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
-			AND r.task_time between #{beginDate} and #{endDate}
- 	</if>
-	<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
-			AND r.edit_time between #{dobeginDate} and #{doendDate}
-	</if> 
+			<if test="dbName == 'mysql'">CONCAT('%',#{taskName}, '%')</if>
+		</if>
+		<if test="isAudit != null">
+				AND r.is_audit=${isAudit}
+		</if>
+		<if test="beginDate!=null and beginDate!='' and endDate!=null and endDate!=''">
+				AND r.task_time between #{beginDate} and #{endDate}
+	 	</if>
+		<if test="dobeginDate!=null and dobeginDate!='' and doendDate!=null and doendDate!=''">
+				AND r.edit_time between #{dobeginDate} and #{doendDate}
+		</if> 
+    	
+    	<!-- 数据范围过滤 -->
+		${sqlMap.dsf}
+    </trim>
+		
 	<choose>
 		<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 			ORDER BY ${page.orderBy}

src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml

@@ -101,7 +101,7 @@
   AND spec_service_id =#{specificServiceCfg.specServiceId}
   </if>
    <if test="specificServiceCfg.specServiceCode != null">
-  AND spec_service_id =#{specificServiceCfg.specServiceCode}
+  AND spec_service_code =#{specificServiceCfg.specServiceCode}
   </if>
   <if test="specificServiceCfg.specServiceName != null and specificServiceCfg.specServiceName != '' ">
   AND spec_service_name like '%${specificServiceCfg.specServiceName}%'

src/main/java/com/nis/web/service/basics/TaskInfoService.java

@@ -25,6 +25,7 @@ public class TaskInfoService extends BaseService{
 	private TaskInfoDao taskInfoDao;
 	
 	public Page<TaskInfo> findTaskInfo(Page<TaskInfo> page, TaskInfo taskInfo) {
+		taskInfo.getSqlMap().put("dsf", configScopeFilter(taskInfo.getCurrentUser(),"r"));
 		// 设置分页参数
 		taskInfo.setPage(page);
 		// 执行分页查询

src/main/java/com/nis/web/service/configuration/RequestInfoService.java

@@ -29,6 +29,7 @@ public class RequestInfoService extends BaseService{
 	private TaskInfoDao taskInfoDao;
 	
 	public Page<RequestInfo> findRequestInfo(Page<RequestInfo> page, RequestInfo requestInfo) {
+		requestInfo.getSqlMap().put("dsf", configScopeFilter(requestInfo.getCurrentUser(),"r"));
 		// 设置分页参数
 		requestInfo.setPage(page);
 		// 执行分页查询