From 2000ce57dc5bd8ff0c8abd36ccf73d5272d7a30f Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 19 Apr 2021 10:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9e=E9=94=A6=E6=B0=B4=E5=92=8C?=
 =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=BD=91=E6=A0=BC=E7=A0=81=E9=A6=96=E9=A1=B5=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/service/impl/DeptMaCodeServiceImpl.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
index 877ed263..dfd3a77f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/DeptMaCodeServiceImpl.java
@@ -67,7 +67,8 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     /**
      * 小程序首页
      */
-    private static String MA_FRONT_PAGE_URL = "pages/index/index";
+    private static String MA_FRONT_PAGE_URL = "pages/indexNew/indexNew";
+    private static String MA_FRONT_VOLUNTEER_PAGE_URL = "pages/heartNew/heartNew";
 
     @Override
     public PageData<DeptMaCodeDTO> page(Map<String, Object> params) {
@@ -152,7 +153,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
         for (Long gridId : gridIdList) {
             entity = new DeptMaCodeEntity();
             entity.setCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
-            entity.setVolunteerCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_PAGE_URL, NumConstant.ONE_STR));
+            entity.setVolunteerCodeUrl(this.createMaCode(String.valueOf(gridId), MA_FRONT_VOLUNTEER_PAGE_URL, NumConstant.ONE_STR));
             entity.setGridId(gridId);
             baseDao.deleteMaCodeByGridId(gridId);
             this.baseDao.insert(entity);
@@ -164,7 +165,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     public Result createDeptMaCode(String gridId) {
         DeptMaCodeEntity entity = new DeptMaCodeEntity();
         entity.setCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
-        entity.setVolunteerCodeUrl(this.createMaCode(gridId, MA_FRONT_PAGE_URL, NumConstant.ONE_STR));
+        entity.setVolunteerCodeUrl(this.createMaCode(gridId, MA_FRONT_VOLUNTEER_PAGE_URL, NumConstant.ONE_STR));
         entity.setGridId(Long.parseLong(gridId));
         entity.setLeaderFlag(YesOrNoEnum.NO.value());
         baseDao.deleteMaCodeByGridId(Long.parseLong(gridId));
@@ -176,7 +177,7 @@ public class DeptMaCodeServiceImpl extends BaseServiceImpl<DeptMaCodeDao, DeptMa
     public Result createGridLeaderMaCode() {
         DeptMaCodeEntity entity = new DeptMaCodeEntity();
         entity.setCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL, NumConstant.ZERO_STR));
-        entity.setVolunteerCodeUrl(this.createMaCode("gridLeader", MA_FRONT_PAGE_URL, NumConstant.ONE_STR));
+        entity.setVolunteerCodeUrl(this.createMaCode("gridLeader", MA_FRONT_VOLUNTEER_PAGE_URL, NumConstant.ONE_STR));
         entity.setLeaderFlag(YesOrNoEnum.YES.value());
         baseDao.deleteMaCodeByLeaderFlag(NumConstant.ONE_STR);
         this.baseDao.insert(entity);