diff --git a/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java b/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java
index 4fd9588..7c77e2c 100644
--- a/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java
+++ b/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java
@@ -170,7 +170,6 @@ public class ActivityJoinAppController extends DefaultBaseController {
 
     @ApiOperation(value = "我的证书查询", notes = "我的活动列表接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "token", value = "token", paramType = "header"),
             @ApiImplicitParam(name = "name", value = "姓名", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "cardNum", value = "身份证号", paramType = "path", dataType = "String"),
             @ApiImplicitParam(name = "phone", value = "手机号", paramType = "path", dataType = "String")
diff --git a/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoincompany/ActivityJoinCompanyAppController.java b/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoincompany/ActivityJoinCompanyAppController.java
index 4910609..1d59ae3 100644
--- a/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoincompany/ActivityJoinCompanyAppController.java
+++ b/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoincompany/ActivityJoinCompanyAppController.java
@@ -137,7 +137,7 @@ public class ActivityJoinCompanyAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "token", value = "token", paramType = "header")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("myCertificateListPage")
+    @GetMapping("/"+ ISystemConstant.APP_RELEASE_SUFFIX + "/myCertificateListPage")
     public SuccessResultList<List<ActivityJoinCompanyDTO>> myCertificateListPage(@RequestHeader("token") String token, ListPage page) {
         Map<String, Object> params = requestParams();
         page.setParams(params);
@@ -152,7 +152,7 @@ public class ActivityJoinCompanyAppController extends DefaultBaseController {
             @ApiImplicitParam(name = "phone", value = "手机号", paramType = "path", dataType = "String")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("myCertificateListPageNoToken")
+    @GetMapping("/"+ ISystemConstant.APP_RELEASE_SUFFIX + "/myCertificateListPageNoToken")
     public SuccessResultList<List<ActivityJoinCompanyDTO>> myCertificateListPage(ListPage page) {
         Map<String, Object> params = requestParams();
         page.setParams(params);
diff --git a/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java b/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java
index 756e16a..512a5e9 100644
--- a/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java
@@ -373,6 +373,25 @@ public class ActivityJoinServiceImpl extends DefaultBaseService implements IActi
             setAppUpdateInfo(token, params);
         }
         activityJoinDao.updateAll(params);
+
+        if(1 == activityJoinVO.getIsCheck()) {
+            for (String s : idList) {
+                ActivityJoinDTO activityJoinDTO = this.get(s);
+                if(null != activityJoinDTO) {
+                    // 发送短信
+                    smsService.sendContentDirectlyByPhone(activityJoinDTO.getPhone(), "报名审核成功");
+                }
+            }
+        }
+        if(-1 == activityJoinVO.getIsCheck()) {
+            for (String s : idList) {
+                ActivityJoinDTO activityJoinDTO = this.get(s);
+                if (null != activityJoinDTO) {
+                    // 发送短信
+                    smsService.sendContentDirectlyByPhone(activityJoinDTO.getPhone(), "活动审核不通过,原因：" + activityJoinVO.getCheckReason());
+                }
+            }
+        }
     }
 
     private List<ActivityJoinDTO> myCertificate(String token, Map<String, Object> params) {
diff --git a/src/main/java/cn/com/tenlion/usercenter/service/activityjoincompany/impl/ActivityJoinCompanyServiceImpl.java b/src/main/java/cn/com/tenlion/usercenter/service/activityjoincompany/impl/ActivityJoinCompanyServiceImpl.java
index 18c590c..a5a3714 100644
--- a/src/main/java/cn/com/tenlion/usercenter/service/activityjoincompany/impl/ActivityJoinCompanyServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/usercenter/service/activityjoincompany/impl/ActivityJoinCompanyServiceImpl.java
@@ -6,6 +6,7 @@ import cn.com.tenlion.usercenter.dao.activityjoincompany.IActivityJoinCompanyDao
 import cn.com.tenlion.usercenter.dao.certificatemanage.ICertificateManageDao;
 import cn.com.tenlion.usercenter.pojo.bos.activityjoincompany.ActivityJoinCompanyBO;
 import cn.com.tenlion.usercenter.pojo.dtos.activity.ActivityDTO;
+import cn.com.tenlion.usercenter.pojo.dtos.activityjoin.ActivityJoinDTO;
 import cn.com.tenlion.usercenter.pojo.dtos.activityjoincompany.ActivityJoinCompanyDTO;
 import cn.com.tenlion.usercenter.pojo.dtos.certificatemanage.CertificateManageDTO;
 import cn.com.tenlion.usercenter.pojo.pos.activityjoincompany.ActivityJoinCompanyPO;
@@ -308,6 +309,25 @@ public class ActivityJoinCompanyServiceImpl extends DefaultBaseService implement
             setAppUpdateInfo(token, params);
         }
         activityJoinCompanyDao.updateAll(params);
+
+        if(1 == activityJoinCompanyVO.getIsCheck()) {
+            for (String s : idList) {
+                ActivityJoinCompanyDTO activityJoinCompanyDTO = this.get(s);
+                if(null != activityJoinCompanyDTO) {
+                    // 发送短信
+                    smsService.sendContentDirectlyByPhone(activityJoinCompanyDTO.getPhone(), "报名审核成功");
+                }
+            }
+        }
+        if(-1 == activityJoinCompanyVO.getIsCheck()) {
+            for (String s : idList) {
+                ActivityJoinCompanyDTO activityJoinCompanyDTO = this.get(s);
+                if (null != activityJoinCompanyDTO) {
+                    // 发送短信
+                    smsService.sendContentDirectlyByPhone(activityJoinCompanyDTO.getPhone(), "活动审核不通过,原因：" + activityJoinCompanyVO.getCheckReason());
+                }
+            }
+        }
     }
 
     private List<ActivityJoinCompanyDTO> getActivityMsg(List<ActivityJoinCompanyDTO> list, Map<String, Object> params) {
diff --git a/src/main/resources/mybatis/mapper/activity-join-company/activity-join-company-mapper.xml b/src/main/resources/mybatis/mapper/activity-join-company/activity-join-company-mapper.xml
index 175cb4c..edf676b 100644
--- a/src/main/resources/mybatis/mapper/activity-join-company/activity-join-company-mapper.xml
+++ b/src/main/resources/mybatis/mapper/activity-join-company/activity-join-company-mapper.xml
@@ -272,11 +272,15 @@
         <if test="activityId != null and activityId != ''">
             AND t1.activity_id = #{activityId}
         </if>
+        <if test="userName != null and userName != ''">
+            AND t1.user_name = #{userName}
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t1.phone = #{phone}
+        </if>
         <if test="keywords != null and keywords != ''">
         AND (
             t1.company_name LIKE CONCAT('%', #{keywords}, '%')
-            OR t1.user_name LIKE CONCAT('%', #{keywords}, '%')
-            OR t1.phone LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="startTime != null and startTime != ''">
diff --git a/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml b/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml
index c347c40..4a3f93e 100644
--- a/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml
+++ b/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml
@@ -335,11 +335,15 @@
         <if test="parentId != null and parentId != ''">
             AND t1.parent_id = #{parentId}
         </if>
+        <if test="cardNum != null and cardNum != ''">
+            AND t1.card_num = #{cardNum}
+        </if>
+        <if test="phone != null and phone != ''">
+            AND t1.phone = #{phone}
+        </if>
         <if test="keywords != null and keywords != ''">
         AND (
             t1.name LIKE CONCAT('%', #{keywords}, '%')
-            OR t1.card_num LIKE CONCAT('%', #{keywords}, '%')
-            OR t1.phone LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="startTime != null and startTime != ''">
diff --git a/src/main/resources/mybatis/mapper/activity/activity-mapper.xml b/src/main/resources/mybatis/mapper/activity/activity-mapper.xml
index 0164062..2f032e0 100644
--- a/src/main/resources/mybatis/mapper/activity/activity-mapper.xml
+++ b/src/main/resources/mybatis/mapper/activity/activity-mapper.xml
@@ -449,6 +449,14 @@
             AND
             status = #{status}
         </if>
+        <if test="joinCount != null and joinCount != ''">
+            AND
+            join_count = #{joinCount}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            AND
+            activity_type = #{activityType}
+        </if>
         <if test="activityTypeId != null and activityTypeId != ''">
             AND
             activity_type_id = #{activityTypeId}
diff --git a/src/main/resources/mybatis/mapper/certificatemanage/certificate-manage-mapper.xml b/src/main/resources/mybatis/mapper/certificatemanage/certificate-manage-mapper.xml
index d4392ee..f8c3363 100644
--- a/src/main/resources/mybatis/mapper/certificatemanage/certificate-manage-mapper.xml
+++ b/src/main/resources/mybatis/mapper/certificatemanage/certificate-manage-mapper.xml
@@ -13,6 +13,7 @@
         <result column="check_reason" property="checkReason"/>
         <result column="is_arrive" property="isArrive"/>
         <result column="is_certificate" property="isCertificate"/>
+        <result column="file_id" property="fileId"/>
         <result column="creator" property="creator"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="modifier" property="modifier"/>
@@ -424,6 +425,9 @@
             <if test="activityId != null and activityId != ''">
                 AND t2.activity_id = #{activityId}
             </if>
+            <if test="userId != null and userId != ''">
+                AND t2.user_id = #{userId}
+            </if>
             <if test="certificateManageId != null and certificateManageId != ''">
                 AND t1.certificate_manage_id = #{certificateManageId}
             </if>
@@ -450,7 +454,7 @@
         WHERE
             t1.is_delete = 0
             <if test="name != null and name != ''">
-                AND t2.user_name = #{name}
+                AND t2.company_name = #{name}
             </if>
             <if test="activityId != null and activityId != ''">
                 AND t2.activity_id = #{activityId}
diff --git a/src/main/resources/templates/activity-join-company/list.html b/src/main/resources/templates/activity-join-company/list.html
index fda1189..1875b52 100644
--- a/src/main/resources/templates/activity-join-company/list.html
+++ b/src/main/resources/templates/activity-join-company/list.html
@@ -18,14 +18,36 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
-                        </div>
-                        新增时间
-                        <div class="layui-inline">
-                            <input type="text" id="startTime" class="layui-input search-item search-item-width-100" placeholder="开始时间" readonly>
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="机构名称">
                         </div>
                         <div class="layui-inline">
-                            <input type="text" id="endTime" class="layui-input search-item search-item-width-100" placeholder="结束时间" readonly>
+                            <input type="text" id="userName" class="layui-input search-item search-item-width-100" placeholder="姓名">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="phone" class="layui-input search-item search-item-width-100" placeholder="手机">
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="isCheck" name="isCheck">
+                                <option value="">审核状态</option>
+                                <option value="0">未审核</option>
+                                <option value="1">审核通过</option>
+                                <option value="-1">审核未通过</option>
+                            </select>
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="isArrive" name="isArrive">
+                                <option value="">是否到场</option>
+                                <option value="0">等待到场</option>
+                                <option value="1">已到场</option>
+                                <option value="-1">未到场</option>
+                            </select>
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="isCertificate" name="isCertificate">
+                                <option value="">是否制证</option>
+                                <option value="0">等待制证</option>
+                                <option value="1">已制证</option>
+                            </select>
                         </div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
@@ -619,6 +641,8 @@
             table.reload('dataTable', {
                 where: {
                     keywords: $('#keywords').val(),
+                    userName: $('#userName').val(),
+                    phone: $('#phone').val(),
                     isCheck: $('#isCheck').val(),
                     isArrive: $('#isArrive').val(),
                     isCertificate: $('#isCertificate').val()
diff --git a/src/main/resources/templates/activity-join/list.html b/src/main/resources/templates/activity-join/list.html
index 4be0dd7..799b779 100644
--- a/src/main/resources/templates/activity-join/list.html
+++ b/src/main/resources/templates/activity-join/list.html
@@ -18,7 +18,13 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入姓名">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="cardNum" class="layui-input search-item search-item-width-100" placeholder="身份证号">
+                        </div>
+                        <div class="layui-inline">
+                            <input type="text" id="phone" class="layui-input search-item search-item-width-100" placeholder="手机号">
                         </div>
                         <div class="layui-inline layui-form search-item">
                             <select id="isCheck" name="isCheck">
@@ -666,6 +672,8 @@
                     keywords: $('#keywords').val(),
                     isCheck: $('#isCheck').val(),
                     isArrive: $('#isArrive').val(),
+                    cardNum: $('#cardNum').val(),
+                    phone: $('#phone').val(),
                     isCertificate: $('#isCertificate').val()
                 },
                 page: {
diff --git a/src/main/resources/templates/activity/list.html b/src/main/resources/templates/activity/list.html
index 8e95422..c4f17dc 100644
--- a/src/main/resources/templates/activity/list.html
+++ b/src/main/resources/templates/activity/list.html
@@ -18,14 +18,26 @@
                 <div class="layui-card-body">
                     <div class="test-table-reload-btn" style="margin-bottom: 10px;">
                         <div class="layui-inline">
-                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
-                        </div>
-                        新增时间
-                        <div class="layui-inline">
-                            <input type="text" id="startTime" class="layui-input search-item search-item-width-100" placeholder="开始时间" readonly>
+                            <input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="活动名称">
                         </div>
                         <div class="layui-inline">
-                            <input type="text" id="endTime" class="layui-input search-item search-item-width-100" placeholder="结束时间" readonly>
+                            <input type="text" id="joinCount" class="layui-input search-item search-item-width-100" placeholder="参与人数">
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="status" name="status">
+                                <option value="">活动状态</option>
+                                <option value="报名中">报名中</option>
+                                <option value="进行中">进行中</option>
+                                <option value="已结束">已结束</option>
+                            </select>
+                        </div>
+                        <div class="layui-inline layui-form search-item">
+                            <select id="activityType" name="activityType">
+                                <option value="">活动类型</option>
+                                <option value="自然保护">自然保护</option>
+                                <option value="自愿服务">自愿服务</option>
+                                <option value="抚育养护">抚育养护</option>
+                            </select>
                         </div>
                         <button type="button" id="search" class="layui-btn layui-btn-sm">
                             <i class="fa fa-lg fa-search"></i> 搜索
@@ -308,8 +320,9 @@
             table.reload('dataTable', {
                 where: {
                     keywords: $('#keywords').val(),
-                    startTime: $('#startTime').val(),
-                    endTime: $('#endTime').val()
+                    joinCount: $('#joinCount').val(),
+                    status: $('#status').val(),
+                    activityType: $('#activityType').val()
                 },
                 page: {
                     curr: currentPage