bugfix

src/main/java/com/caimei/modules/user/service/NewCmClubService.java

@@ -111,14 +111,18 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         cmClubRemarks.setPage(cmClubRemarksPage);
         List<CmClubRemarks> remarksList = newCmClubDao.findRegistList(cmClubRemarks);
         remarksList.forEach(remarks -> {
-            if (null != remarks.getConsultType()) {
-                List<String> strings = Arrays.asList(remarks.getConsultType().split(","));
-                String cons = "";
-                for (String string : strings) {
-                    cons += newCmClubDao.findClassName(string) + ",";
+            if (StringUtils.isNotBlank(remarks.getConsult())) {
+                StringBuilder cons = new StringBuilder();
+                if(remarks.getConsult().contains(",")){
+                    String[] split = remarks.getConsult().split(",");
+                    for (String string : split) {
+                        cons.append(newCmClubDao.findClassName(string)).append(",");
+                    }
+                    cons = new StringBuilder(cons.substring(0, cons.length() - 1));
+                }else{
+                    cons = new StringBuilder(newCmClubDao.findClassName(remarks.getConsult()));
                 }
-                cons = cons.substring(0, cons.length() - 1);
-                remarks.setConsultType(cons);
+                remarks.setConsultType(cons.toString());
             }
             List<String> imageList = newCmClubDao.getRemarksImageList(remarks.getRemarksId());
             List<RemarksFileVo> fileList = newCmClubDao.getRemarksFileList(remarks.getRemarksId());

src/main/java/com/caimei/modules/user/service/VisitRemarkService.java

@@ -31,14 +31,18 @@ public class VisitRemarkService extends CrudService<VisitRemarkDao, VisitRemarkV
         visit.setPage(visitRemarkVoPage);
         List<VisitRemarkVo> remarksList = visitRemarkDao.findRegistList(visit);
         remarksList.forEach(remarks -> {
-            if (null != remarks.getConsultType()) {
-                List<String> strings = Arrays.asList(remarks.getConsultType().split(","));
-                String cons = "";
-                for (String string : strings) {
-                    cons += visitRemarkDao.findClassName(string) + ",";
+            if (StringUtils.isNotBlank(remarks.getConsult())) {
+                StringBuilder cons = new StringBuilder();
+                if(remarks.getConsult().contains(",")){
+                    String[] split = remarks.getConsult().split(",");
+                    for (String string : split) {
+                        cons.append(visitRemarkDao.findClassName(string)).append(",");
+                    }
+                    cons = new StringBuilder(cons.substring(0, cons.length() - 1));
+                }else{
+                    cons = new StringBuilder(visitRemarkDao.findClassName(remarks.getConsult()));
                 }
-                cons = cons.substring(0, cons.length() - 1);
-                remarks.setConsultType(cons);
+                remarks.setConsultType(cons.toString());
             }
             List<String> imageList = visitRemarkDao.getRemarksImageList(remarks.getRemarksId());
             List<RemarksFileVo> fileList = visitRemarkDao.getRemarksFileList(remarks.getRemarksId());

src/main/resources/mappings/modules/serviceteam/CmServiceteamRoleMapper.xml

@@ -66,6 +66,7 @@
 		(SELECT s.serviceProviderID FROM serviceprovider s
 		WHERE s.name LIKE CONCAT('%',#{leaderName},'%'))
 		</if>
+		order by csr.createdTime desc
 	</select>
 	<select id="findGroups" resultType="com.caimei.modules.project.model.ServiceProviderModel">
 		SELECT csg.serviceId AS serviceProviderID,s.name

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

@@ -443,7 +443,7 @@
 	</select>
 	<select id="findRegistList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
 		SELECT ccr.id AS remarksId, ccr.remarks,s.name AS spName, ccr.addTime,ccr.questionMan,
-		       csr.leaderId AS leaderId,ccr.consultType, c.Name as clubName,
+		       csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as consult, c.Name as clubName,
 			   (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName
 		FROM cm_club_remarks ccr
 				 LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID

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

@@ -63,7 +63,7 @@
     </select>
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
         SELECT ccr.id AS remarksId, ccr.remarks,s.name AS spName, ccr.addTime,ccr.questionMan,
-        csr.leaderId AS leaderId,ccr.consultType,
+        csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as consult,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName
         FROM cm_visitor_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID

src/main/webapp/WEB-INF/views/modules/consult/type/cmConsulttypeForm.jsp

@@ -12,9 +12,14 @@
                     var sortNumber = $("#sortNumber").val();
                     var jy = /^[1-9]\d*$/;
                     console.log(sortNumber);
+                    var className = $("#className").val();
+                    if(null==className||""==className){
+                        alertx("咨询类别不为空");
+                        return false;
+                    }
                     if (!jy.test(sortNumber)) {
-                        alert("排序值只能为正整数 ！");
-                        return;
+                        alertx("排序值不能为空且只能为正整数 ！");
+                        return false;
                     }
                     loading('正在提交，请稍等...');
                     form.submit();

src/main/webapp/WEB-INF/views/modules/serviceteam/cmServiceteamRoleForm.jsp

@@ -9,6 +9,12 @@
             //$("#name").focus();
             $("#inputForm").validate({
                 submitHandler: function (form) {
+                    var cc=$("#findgroup").val();
+                    // console.log(cc);
+                    if (null == cc || cc < 1) {
+                        alertx("请选择组长！");
+                        return false;
+                    }
                     loading('正在提交，请稍等...');
                     form.submit();
                 },
@@ -62,7 +68,9 @@
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
-    <shiro:hasPermission name="user:newCmClub:edit"><li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li></shiro:hasPermission>
+    <shiro:hasPermission name="user:newCmClub:edit">
+        <li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li>
+    </shiro:hasPermission>
     <li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
     <li><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
     <li class="active"><a
@@ -78,7 +86,7 @@
     <div class="control-group">
         <div class="controls">
             <c:if test="${not empty cmServiceteamRole.teamId}">
-            <span style="color:red;">本页面包含本组组员和所有未分组协销账号，上限选择十个，如已选十个则不可选更多组员，取消已选项可复选至十个</span>
+                <span style="color:red;">本页面包含本组组员和所有未分组协销账号，上限选择十个，如已选十个则不可选更多组员，取消已选项可复选至十个</span>
                 <br/>
                 <br/>
             </c:if>
@@ -93,8 +101,8 @@
             <c:forEach items="${cmServiceteamRole.group}" var="group" varStatus="status">
                 <c:if test="${not empty group.teamFlag}">
                     <input class="N${group.serviceProviderID}" type="checkbox" name="ids" id="${group.name}"
-                       value="${group.serviceProviderID}" style="zoom: 150%" checked
-                       onclick="getMember()">
+                           value="${group.serviceProviderID}" style="zoom: 150%" checked
+                           onclick="getMember()">
                     <span style="font-size: 15px;" id="${group.serviceProviderID}">${group.name}&nbsp;&nbsp;</span>
                 </c:if>
                 <c:if test="${empty group.teamFlag}">
@@ -122,13 +130,13 @@
         <div class="controls">
             <c:if test="${not empty cmServiceteamRole.teamId}">
                 <form:select path="leaderId" class="input-medium" id="findgroup">
-                <form:option value="" label="请在组员中选择"/>
+                    <form:option value="" label="请在组员中选择"/>
                     <form:option value="${cmServiceteamRole.leaderId}" label="${cmServiceteamRole.leaderName}"/>
-                <c:forEach items="${cmServiceteamRole.group}" var="group">
-                    <c:if test="${group.serviceProviderID ne cmServiceteamRole.leaderId && not empty group.teamFlag}">
-                    <form:option value="${group.serviceProviderID}" label="${group.name}"/>
-                    </c:if>
-                </c:forEach>
+                    <c:forEach items="${cmServiceteamRole.group}" var="group">
+                        <c:if test="${group.serviceProviderID ne cmServiceteamRole.leaderId && not empty group.teamFlag}">
+                            <form:option value="${group.serviceProviderID}" label="${group.name}"/>
+                        </c:if>
+                    </c:forEach>
                 </form:select>
             </c:if>
             <c:if test="${empty cmServiceteamRole.teamId}">

src/main/webapp/WEB-INF/views/modules/serviceteam/cmServiceteamRoleList.jsp

@@ -85,7 +85,7 @@
 				</td>
 				<td>
     				<a href="${ctx}/serviceteam/cmServiceteamRole/form?teamId=${cmServiceteamRole.teamId}">编辑</a>
-					<a href="${ctx}/serviceteam/cmServiceteamRole/delete?teamId=${cmServiceteamRole.teamId}" onclick="return confirmx('确认要删除该协销小组吗？', this.href)">删除</a>
+					<a href="${ctx}/serviceteam/cmServiceteamRole/delete?teamId=${cmServiceteamRole.teamId}" onclick="return confirmx('确认要删除该协销小组吗？删除后，该小组的全部组员 需要重新分配新小组', this.href)">删除</a>
 				</td>
 			</tr>
 		</c:forEach>

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

@@ -100,7 +100,7 @@
 	<div class="pagination">${page}</div>
 	</c:if>
 	<c:if test="${empty page.list}">
-		<font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无任何备注..</font>
+		<font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无任何记录..</font>
 	</c:if>
 </form:form>
 </body>

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

@@ -6,6 +6,17 @@
   <meta name="decorator" content="default"/>
   <script>
     $(document).ready(function () {
+      $("#inputForm").validate({
+        submitHandler: function(form){
+          var cc = $("#serviceProviderID").val();
+          if (null == cc || cc < 1) {
+            alertx("请选择总管理员！");
+            return false;
+          }
+          loading('正在提交，请稍等...');
+          form.submit();
+        }
+      });
     });
   </script>
 </head>