+ 交通强国小程序变更

ruoyi-system/src/main/java/com/ruoyi/system/mapper/CpsUsrApplyMapper.java

@@ -32,7 +32,7 @@ public interface CpsUsrApplyMapper
      */
     public List<CpsUsrApply> selectCpsUsrApplyList(CpsUsrApply cpsUsrApply);
 
-    List<Map<String,Object>> qryUserApply(String usrId);
+    List<Map<String, Object>> qryUserApply(@Param("usrId") String usrId,@Param("tel") String tel);
 
     /**
      * 新增cps_usr_apply与会申请

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CpsUsrApplyServiceImpl.java

@@ -110,7 +110,7 @@ public class CpsUsrApplyServiceImpl implements ICpsUsrApplyService {
 
     public List<Map<String, Object>> qryUserApplyList() {
         WeChatUser loginUser = (WeChatUser) SecurityUtils.getLoginUser();
-        return cpsUsrApplyMapper.qryUserApply(Long.toString(loginUser.getUserId()));
+        return cpsUsrApplyMapper.qryUserApply(Long.toString(loginUser.getUserId()), loginUser.getTel());
     }
 
     /**

ruoyi-system/src/main/resources/mapper/cp/CpsUsrApplyMapper.xml

@@ -77,6 +77,9 @@
                usr_wechat_id        usrWechatId,
                content_id           contentId,
                content_title        contentTitle,
+               theme_flag           themeFlag,
+               theme_title          themeTitle,
+               theme_id             themeId,
                usrApply.create_time createTime,
                dic.dict_label       applyTypeName,
                dicReview.dict_label reviewStateName
@@ -84,7 +87,7 @@
                  inner JOIN sys_dict_data dic on usrApply.apply_type = dic.dict_value and dic.dict_type = 'apply_type'
                  inner JOIN sys_dict_data dicReview
                             on usrApply.review_state = dicReview.dict_value and dicReview.dict_type = 'review_state'
-        where usrApply.usr_wechat_id = #{usrId}
+        where usrApply.usr_wechat_id = #{usrId} or tel=#{tel}
         order by usrApply.create_time desc
     </select>
 

ruoyi-ui/src/utils/EnumConst.js

@@ -136,7 +136,7 @@ export const TFC_TYPE = {
     value: 2,
   },
   3: {
-    name: '公路',
+    name: '自行前往',
     value: 3,
   },
 };