2019/11/4 代码冲突

src/main/java/com/yc/education/controller/admin/AdminsBackController.java

@@ -114,17 +114,20 @@ public class AdminsBackController extends BaseController {
 			ModelAndView result = new ModelAndView("admin/index");
 			request.getSession().setAttribute(AppConst.Session_Admin, admin);
 			result.addObject("admin", admin);
+
+			/*后台管理  留言反馈  显示提示信息 */
 			List<Feedback> feedbackList = iFeedBackService.listFeedBackInfo(null,"0",1,Integer.MAX_VALUE);
 			if(feedbackList != null){
 				result.addObject("unread", feedbackList.size());
 			}else{
 				result.addObject("unread", 0);
 			}
+
+			/*后台管理  经销商和服务商认证模块  显示提示信息*/
 			List<Authentication> authentications = iAuthenticationService.listAuthenticationInfoProvider("","1","","",1,Integer.MAX_VALUE);
 			List<Authentication> authentications1 = iAuthenticationService.listAuthenticationInfoProvider("","0","","",1,Integer.MAX_VALUE);
 			List<Authentication> authentications2 = iAuthenticationService.listAuthenticationInfoSupplier("","1","","",1,Integer.MAX_VALUE);
 			List<Authentication> authentications3 = iAuthenticationService.listAuthenticationInfoSupplier("","0","","",1,Integer.MAX_VALUE);
-
 			if (authentications != null || authentications1 != null ||authentications2 != null || authentications3 != null){
 				result.addObject("unAuthentication",authentications.size()+authentications1.size());
 				result.addObject("unAuthenticationSupplier",authentications2.size()+authentications3.size());
@@ -132,6 +135,7 @@ public class AdminsBackController extends BaseController {
 				result.addObject("unAuthentication",0);
 				result.addObject("unAuthenticationSupplier",0);
 			}
+
 			return result;
 		}else{
 			ModelAndView result = new ModelAndView("admin/login");

src/main/java/com/yc/education/controller/admin/ServiceCategoryAdminController.java

@@ -464,13 +464,16 @@ public class ServiceCategoryAdminController {
 
         int rows  =  iServiceCategoryService.listByPId(service.getId()); //判断要修改的是二级还是三级
         if (rows > 0){
-            List<ServiceCategory> findSecondService = iServiceCategoryService.findSecondService(String.valueOf(service.getpId()));//二级pid---一级id
+           /* List<ServiceCategory> findSecondService = iServiceCategoryService.findSecondService(String.valueOf(service.getpId()));//二级pid---一级id*/
+            ServiceCategory   findSecondService =iServiceCategoryService.selectByKey(service.getpId());
             result.addObject("first",findSecondService);
         }else {   //三级
-            List<ServiceCategory> findSecondService1 = iServiceCategoryService.findSecondService(String.valueOf(service.getpId()));//根据三级pid--二级id
+           /* List<ServiceCategory> findSecondService1 = iServiceCategoryService.findSecondService(String.valueOf(service.getpId()));//根据三级pid--二级id*/
 
+            ServiceCategory  findSecondService1 = iServiceCategoryService.selectByKey(service.getpId()); //根据选中的三级的pid，查询id为要修改信息的父类id的信息
             result.addObject("two",findSecondService1);//二级名称
-            List<ServiceCategory> findSecondService = iServiceCategoryService.findSecondService(String.valueOf(service.getpId()));//根据三级pid--二级id---二级pid---一级id
+           /* List<ServiceCategory> findSecondService = iServiceCategoryService.findSecondService(String.valueOf(service.getpId()));//根据三级pid--二级id---二级pid---一级id*/
+            ServiceCategory  findSecondService = iServiceCategoryService.selectByKey(findSecondService1.getpId());//根据二级Pid，查询id为要修改信息的父类id的信息
             result.addObject("first",findSecondService);//一级名称
         }
 

src/main/webapp/WEB-INF/jsp/admin/index.jsp

@@ -147,6 +147,18 @@
 				   </dt>
 				</a>
 			</dl>--%>
+			<%--<dl id="menu-activity">
+				<dt>
+					<i class="Hui-iconfont">&#xe692;</i>活动资讯<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i>
+				</dt>
+				<dd>
+					<ul>
+						<li><a data-href="activityNewsList.html" data-title="资讯管理" href="javascript:void(0)">资讯管理</a></li>
+						<li><a data-href="activityTypeList.html" data-title="类别管理" href="javascript:void(0)">类别管理</a></li>
+						<li><a data-href="activityTagList.html" data-title="标签管理" href="javascript:void(0)">标签管理</a></li>
+					</ul>
+				</dd>
+			</dl>--%>
 			<dl id="menu-serviceProvider">
 				<dt>
 					<i class="Hui-iconfont">&#xe692;</i>服务商管理<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i>
@@ -213,22 +225,9 @@
 				</dd>
 			</dl>
 
-			<%--<dl id="menu-activity">
-				<dt>
-					<i class="Hui-iconfont">&#xe692;</i>活动资讯<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i>
-				</dt>
-				<dd>
-					<ul>
-						<li><a data-href="activityNewsList.html" data-title="资讯管理" href="javascript:void(0)">资讯管理</a></li>
-						<li><a data-href="activityTypeList.html" data-title="类别管理" href="javascript:void(0)">类别管理</a></li>
-						<li><a data-href="activityTagList.html" data-title="标签管理" href="javascript:void(0)">标签管理</a></li>
-					</ul>
-				</dd>
-			</dl>--%>
-
 			<dl id="menu-admin">
 				<dt>
-					<i class="Hui-iconfont">&#xe692;</i>管理员管理<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i>
+					<i class="Hui-iconfont">&#xe692;</i>管理员管理<i class="Hui-iconfont  menu_dropdown-arrow">&#xe6d5;</i>
 				</dt>
 				<dd>
 					<ul>

src/main/webapp/WEB-INF/jsp/admin/serviceCategoryUpdateSupplier.jsp

@@ -84,9 +84,9 @@
             <div class="formControls col-xs-8 col-sm-9">
                 <select name="pId" id="pId" onchange="choose(this.value)" class="input-text">
                     <c:forEach items="${findall}" var="newtype">
-                        <c:forEach items="${first}" var="first">
+                       <%-- <c:forEach items="${first}" var="first">--%>
                         <option value="${newtype.id}" <c:if test="${newtype.id == first.id}">selected</c:if> >${newtype.name}</option>
-                        </c:forEach>
+                        <%--</c:forEach>--%>
                     </c:forEach>
                 </select>
             </div>
@@ -96,9 +96,9 @@
             <label class="form-label col-xs-4 col-sm-1"><span class="c-red"></span>服务二级类别：</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <select name="twoPId" id="two" onchange="chooseTwo(this)" class="input-text">
-                    <c:forEach items="${two}" var="two">
+                    <%--<c:forEach items="${two}" var="two">--%>
                         <option value="${two.id}">${two.name}</option>
-                    </c:forEach>
+                   <%-- </c:forEach>--%>
 
                 </select>
             </div>