Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/workprojectnotify/service/WorkProjectNotifyService.java

@@ -83,7 +83,10 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 	}
 
 	public Page<WorkProjectNotify> findPage(Page<WorkProjectNotify> page, WorkProjectNotify workProjectNotify) {
-		int count = dao.queryCount(workProjectNotify);
+		Integer count = dao.queryCount(workProjectNotify);
+		if(null == count){
+			count = 0;
+		}
 		page.setCount(count);
 		page.setCountFlag(false);
 		workProjectNotify.setPage(page);
@@ -226,7 +229,7 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 	public void insert(WorkProjectNotify workProjectNotify) {
 		dao.insert(workProjectNotify);
 	}
-	
+
 	@Transactional(readOnly = false)
 	public void delete(WorkProjectNotify workProjectNotify) {
 		super.delete(workProjectNotify);
@@ -276,4 +279,4 @@ public class WorkProjectNotifyService extends CrudService<WorkProjectNotifyDao,
 		dao.deleteByNotifyId(workProjectNotify);
 	}
 
-}
+}

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -1032,16 +1032,16 @@
 					</c:choose>
 					,"submitMoneyStr":
 					<c:choose>
-						<c:when test="${'1'==projectRecords.submitMoney}">
-							"B级"
+						<c:when test="${'2'==projectRecords.submitMoney}">
+							"A级"
 						</c:when>
 						<c:otherwise>
 							<c:choose>
-								<c:when test="${'2'==projectRecords.submitMoney}">
-									"A级"
+								<c:when test="${'1'==projectRecords.emergencyProject}">
+									"B级紧急"
 								</c:when>
 								<c:otherwise>
-									""
+									"B级非紧急"
 								</c:otherwise>
 							</c:choose>
 						</c:otherwise>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -747,11 +747,11 @@
 				,{field: 'projId',align:'center', title: '项目编号/项目定义号',width:160}
 				,{field:'projName',align:'center', title: '项目名称', minWidth:200,templet:function(d){
 						var xml="";
-						<shiro:hasPermission name="ruralProject:ruralProjectView:costlistView">
+						<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
 						xml+="<a class=\"attention-info pid\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">"
 						</shiro:hasPermission>
 						xml+=d.projName
-						<shiro:hasPermission name="ruralProject:ruralProjectView:costlistView">
+						<shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
 						xml+="</a>";
 						</shiro:hasPermission>
 						return xml;
@@ -938,16 +938,16 @@
 					</c:choose>
 					,"submitMoneyStr":
 					<c:choose>
-						<c:when test="${'1'==projectRecords.submitMoney}">
-							"B级"
+						<c:when test="${'2'==projectRecords.submitMoney}">
+							"A级"
 						</c:when>
 						<c:otherwise>
 							<c:choose>
-								<c:when test="${'2'==projectRecords.submitMoney}">
-									"A级"
+								<c:when test="${'1'==projectRecords.emergencyProject}">
+									"B级紧急"
 								</c:when>
 								<c:otherwise>
-									""
+									"B级非紧急"
 								</c:otherwise>
 							</c:choose>
 						</c:otherwise>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -1031,16 +1031,16 @@
 					</c:choose>
 					,"submitMoneyStr":
 					<c:choose>
-							<c:when test="${'1'==projectRecords.submitMoney}">
-							"B级"
+							<c:when test="${'2'==projectRecords.submitMoney}">
+							"A级"
 							</c:when>
 							<c:otherwise>
 								<c:choose>
-								<c:when test="${'2'==projectRecords.submitMoney}">
-								"A级"
+								<c:when test="${'1'==projectRecords.emergencyProject}">
+								"B级紧急"
 								</c:when>
 								<c:otherwise>
-								""
+								"B级非紧急"
 								</c:otherwise>
 								</c:choose>
 							</c:otherwise>