Drew 6 лет назад
Родитель
Сommit
16a4e5c3e8

+ 1 - 1
src/main/java/com/thmodel/dao/ModelInfoDao.java

@@ -28,7 +28,7 @@ public interface ModelInfoDao {
      * @param memberpk 当前会员pk
      * @return
      */
-    public Map<String, Object> getmodel(int memberpk, int index, int size);
+    public Map<String, Object> getmodel(int memberpk,String area, int index, int size);
 
     /**
      * 根据账号pk

+ 8 - 1
src/main/java/com/thmodel/dao/impl/ModelInfoDaoImpl.java

@@ -45,8 +45,15 @@ public class ModelInfoDaoImpl implements ModelInfoDao {
     private static MemberinfoService memberinfoService = new MemberinfoServiceImpl();
 
     @Override
-    public Map<String, Object> getmodel(int memberpk, int index, int size) {
+    public Map<String, Object> getmodel(int memberpk, String area, int index, int size) {
         String whereSql = " m.nominate = 1 ";
+        if ("烟台".equals(area)) {
+            if (StringUtils.isNotEmpty(whereSql)) {
+                whereSql += " and b.Area=80 ";
+            } else {
+                whereSql = " b.Area=80 ";
+            }
+        }
         List<ModelInfo> list = modelInfoAndPhotoInfoList(memberpk, whereSql, true, index, size);
 
         Map<String, Object> resultMap = new HashMap<String, Object>();

+ 1 - 1
src/main/java/com/thmodel/service/ModelInfoService.java

@@ -23,7 +23,7 @@ public interface ModelInfoService {
      * @param memberpk 当前会员pk
      * @return
      */
-    public Map<String, Object> dogetmodel(int memberpk, int index, int size);
+    public Map<String, Object> dogetmodel(int memberpk, String area, int index, int size);
 
     /**
      * 获取关注的人才信息(10个)

+ 2 - 2
src/main/java/com/thmodel/service/impl/ModelInfoServiceImpl.java

@@ -52,9 +52,9 @@ public class ModelInfoServiceImpl implements ModelInfoService {
     private static NimserverServiceImpl nimserverService = new NimserverServiceImpl();
 
     @Override
-    public Map<String, Object> dogetmodel(int memberpk, int index, int size) {
+    public Map<String, Object> dogetmodel(int memberpk, String area, int index, int size) {
 
-        return modelinfodao.getmodel(memberpk, index, size);
+        return modelinfodao.getmodel(memberpk, area, index, size);
 
     }
 

+ 2 - 1
src/main/java/com/thmodel/servlet/ModelInfoServlet.java

@@ -69,11 +69,12 @@ public class ModelInfoServlet extends HttpServlet {
 
                 int index = CommentUtils.myToInt(request.getParameter("index"));
                 int size = CommentUtils.myToInt(request.getParameter("size"));
+                String area = CommentUtils.myToString(request.getParameter("area"));
 
                 index = index == 0 ? 1 : index;
                 size = size == 0 ? 10 : size;
 
-                Map<String, Object> map = modelInfoService.dogetmodel(memberpk, index, size);
+                Map<String, Object> map = modelInfoService.dogetmodel(memberpk, area, index, size);
 
                 List<ModelInfo> list = (List<ModelInfo>) map.get("data");
                 int count = (int) map.get("count");