关键词库,客户咨询记录bugfix

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -451,8 +451,8 @@
         ccr.id AS remarksId, ccr.remarks,s.linkman AS spName, ccr.addTime,ccr.questionMan,
         csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as consult, c.Name as
         clubName,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= ccr.oldserviceProviderId) AS oldName
+        (SELECT name FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName
+#         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID= ccr.serviceProviderID) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
 #         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID

src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -128,12 +128,13 @@
             <c:forEach items="${page.list}" var="clubRemarks" varStatus="remark">
                 <div class="td clear" style="dashed:#0066CC;">
                     <div style="font-weight: bold;width: 100%;float: left;">
-                        <c:if test="${not empty clubRemarks.oldName}">
-                            <span style="float: left;">${clubRemarks.oldName}</span>
-                        </c:if>
-                        <c:if test="${empty clubRemarks.oldName}">
-                            <span style="float: left;">${clubRemarks.spName}</span>
-                        </c:if>
+<%--                        <c:if test="${not empty clubRemarks.oldName}">--%>
+<%--                            <span style="float: left;">${clubRemarks.oldName}</span>--%>
+<%--                        </c:if>--%>
+<%--                        <c:if test="${empty clubRemarks.oldName}">--%>
+<%--                            <span style="float: left;">${clubRemarks.spName}</span>--%>
+<%--                        </c:if>--%>
+                        <span style="float: left;">${clubRemarks.spName}</span>
                         <span style="float: left;margin-left:20px;"><fmt:formatDate value="${clubRemarks.addTime}"
                                                                                     pattern="yyyy-MM-dd HH:mm"/></span>
                         <span style="float: left;margin-left:120px;">管理员：${clubRemarks.leaderName}</span>

src/main/webapp/WEB-INF/views/modules/userNew/cmRemaksList.jsp

@@ -36,6 +36,8 @@
 </ul>
 <form:form id="searchForm" modelAttribute="cmRemaks" action="${ctx}/new/user/agency/cmrenaksList" method="post"
            class="breadcrumb form-search">
+    <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
+    <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
         <label>关键词：</label>
         <form:input path="remarks" name="remarks" htmlEscape="false" class="input-medium" maxlength="10"/>

src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp

@@ -101,13 +101,13 @@
 		<c:forEach items="${page.list}" var="visitRemarks" varStatus="remark">
 			<div class="td clear">
 				<div style="font-weight: bold;width: 100%;float: left;">
-					<c:if test="${not empty visitRemarks.oldName}">
-						<span style="float: left;">${visitRemarks.oldName}</span>
-					</c:if>
-					<c:if test="${empty visitRemarks.oldName}">
-						<span style="float: left;">${visitRemarks.serviceName}</span>
-					</c:if>
-<%--                    <span style="float: left;">${visitRemarks.serviceName}</span>--%>
+<%--					<c:if test="${not empty visitRemarks.oldName}">--%>
+<%--						<span style="float: left;">${visitRemarks.oldName}</span>--%>
+<%--					</c:if>--%>
+<%--					<c:if test="${empty visitRemarks.oldName}">--%>
+<%--						<span style="float: left;">${visitRemarks.serviceName}</span>--%>
+<%--					</c:if>--%>
+                    <span style="float: left;">${visitRemarks.serviceName}</span>
 					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${visitRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span>
                     <span style="float: left;margin-left:120px;">管理员：${visitRemarks.leaderName}</span>
                 </div>

src/main/webapp/WEB-INF/views/modules/userNew/cmVisitRemarksList.jsp

@@ -59,13 +59,13 @@
 		<c:forEach items="${page.list}" var="visitRemarks" varStatus="remark">
 			<div class="td clear">
 				<div style="font-weight: bold;width: 100%;float: left;"
-				<c:if test="${not empty visitRemarks.oldName}">
-					<span style="float: left;">${visitRemarks.oldName}</span>
-				</c:if>
-				<c:if test="${empty visitRemarks.oldName}">
-					<span style="float: left;">${visitRemarks.serviceName}</span>
-				</c:if>
-<%--				<span style="float: left;">${visitRemarks.serviceName}</span>--%>
+<%--				<c:if test="${not empty visitRemarks.oldName}">--%>
+<%--					<span style="float: left;">${visitRemarks.oldName}</span>--%>
+<%--				</c:if>--%>
+<%--				<c:if test="${empty visitRemarks.oldName}">--%>
+<%--					<span style="float: left;">${visitRemarks.serviceName}</span>--%>
+<%--				</c:if>--%>
+				<span style="float: left;">${visitRemarks.serviceName}</span>
 					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${visitRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span></div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>