Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

whepi-ui/templates/yeweihui/tuangou.js

@@ -100,7 +100,7 @@ function makeList(list) {
         $('#tg_list1').append($('<a href="javascript:tgItemSelect(' + "'" + item.jmId + "'" + ');" style="color: grey;">\n' +
             '                            <div style="display: flex; flex-direction: row; text-align: center; font-size: small; line-height: 5vh;">\n' +
             '                                <div style="width: 40%; padding-left:3vw; text-align: left; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + item.tgTitle + '</div>\n' +
-            '                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + item.currentNum + '/' + item.tgMinNum + '</div>\n' +
+            '                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + item.currentNum + '</div>\n' +
             '                                <div style="width: 30%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + sstime + '</div>\n' +
             '                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + status + '</div>\n' +
             '                            </div>\n' +
@@ -138,7 +138,7 @@ function makeMyPublishList(list) {
         $('#tg_list2').append($('<a href="javascript:tgMyItemSelect(' + "'" + item.jmId + "'" + ');" style="color: grey;">\n' +
             '                            <div style="display: flex; flex-direction: row; text-align: center; font-size: small; line-height: 5vh;">\n' +
             '                                <div style="width: 40%; padding-left:3vw; text-align: left; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + item.tgTitle + '</div>\n' +
-            '                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + item.currentNum + '/' + item.tgMinNum + '</div>\n' +
+            '                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + item.currentNum + '</div>\n' +
             '                                <div style="width: 30%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + sstime + '</div>\n' +
             '                                <div style="width: 15%; overflow:hidden;text-overflow:ellipsis;white-space:nowrap;">' + status + '</div>\n' +
             '                            </div>\n' +

whepi-web/src/main/java/com/bofeng/service/JmTuangouMemberService.java

@@ -18,7 +18,13 @@ public class JmTuangouMemberService {
   private JmTuangouMemberDao jmTuangouMemberDao;
 
   public List<JmTuangouMember> querMemberListByJmId(Long jmId) {
-    return jmTuangouMemberDao.querMemberListByJmId(jmId);
+    List<JmTuangouMember> jmTuangouMembers = jmTuangouMemberDao.querMemberListByJmId(jmId);
+    if (jmTuangouMembers != null && jmTuangouMembers.size() > 0) {
+      for (JmTuangouMember xq : jmTuangouMembers) {
+        xq.setForName(xq.getRidgepole() + "-" + xq.getUnit() + "-" + xq.getHouseNumber());
+      }
+    }
+    return jmTuangouMembers;
   }
 
   public List<JmTuangouMember> querMemberListByJmIdXX(Map<String, Object> queryParam) {

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -67,8 +67,8 @@ public class UserOpenController {
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-            /*list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);*/
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");