提交 我参加的活动，加上姓名

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpActivity.java

@@ -43,6 +43,8 @@ public class TpActivity {
     
     private String userName;
 
+    private String userRole;
+
     private String signInCode;
 
     public String getSignInCode() {
@@ -240,4 +242,12 @@ public class TpActivity {
     public void setImgList(List<String> imgList) {
         this.imgList = imgList;
     }
+
+    public String getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(String userRole) {
+        this.userRole = userRole;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -644,6 +644,7 @@ public class SocialServiceImpl implements SocialServiceI {
         Map<String, Object> parameter = Maps.newHashMap();
         Page<TpActivity> pageList = PageHelper.startPage(pageNum, paeSize);
         List<TpActivity> tpActivity = tpActivityMapper.selecttpActivity(userElement.getUserVerifyId(), userElement.getCommunityId());
+        tpActivity.forEach(e -> e.setUserRole("物业"));
         parameter.put("list", tpActivity);
         parameter.put("total", pageList.getTotal());
         responseBean.addSuccess(parameter);

CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml

@@ -22,7 +22,8 @@
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="sign_in_code" property="signInCode" jdbcType="VARCHAR" />
-
+    <result column="userRole" property="userRole"/>
+    <result column="userName" property="userName"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, activity_title, activity_carousel_img, activity_content, sort, 
@@ -295,9 +296,13 @@
   </select>
 
   <select id="selecttpActivity" resultMap="BaseResultMap">
-    SELECT * FROM
+    SELECT
+    a.*,
+    tu.user_name as userName
+    FROM
     tp_activity a
     LEFT JOIN tp_activity_sign_up tr ON tr.activity_id = a.id
+    LEFT JOIN tp_user tu ON a.create_user = tu.id
     WHERE tr.ta_user_id = #{id}
     AND tr.community_id =#{communityId}
     order by a.create_date desc

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -109,6 +109,7 @@ export default {
               this.$router.push({ name: 'index' })
             } else {
               this.loading = false
+              this.$message.error(res.message)
             }
           }).catch(() => {
             this.loading = false

VUECODE/smart-property-manage/src/App.vue

@@ -9,3 +9,4 @@ export default {
   name: 'App'
 }
 </script>
+