Merge branches 'dev' and 'master' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/controller/WxUserController.java

@@ -139,11 +139,11 @@ public class WxUserController {
 		param.put("openid",openid);
 		param.put("access_token",token);
 		param.put("lang","zh_CN");
-		//HttpRequest res= HttpRequest.get("https://api.weixin.qq.com/sns/userinfo", param, true);
-		HttpRequest res= HttpRequest.get("https://api.weixin.qq.com/cgi-bin/user/info", param, false);
+		HttpRequest res= HttpRequest.get("https://api.weixin.qq.com/sns/userinfo", param, true);
+		//HttpRequest res= HttpRequest.get("https://api.weixin.qq.com/cgi-bin/user/info", param, true);
 		String body = res.body();
-		System.err.println("res======"+res);
-		System.err.println("body======"+body);
+		//System.err.println("res======"+res);
+		//System.err.println("body======"+body);
 		String headimgurl = JSON.parseObject(body).getString("headimgurl");
 		String encode =null;
 		try {

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxVoteServiceImpl.java

@@ -145,25 +145,30 @@ public class WxVoteServiceImpl implements WxVoteService {
     @Override
     public List<VoteDO> voteListStu(Long stuId, Integer pageIndex, Integer pageSize, Integer voteType) throws Exception {
         Integer pageStart = (pageIndex - 1) * pageSize;
-        List<Long> voteIds = new ArrayList<>();
         List<Long> longs = voteMapper.selectStuIds("%" + stuId + "%");
-        voteIds.addAll(longs);
-        List<VoteDO> votes = voteMapper.selectVoteListByVoteIds(voteIds, pageStart, pageSize, voteType);
-        if (ObjectUtils.isNotEmpty(votes)) {
-            List<VoteDO> votes1 = new ArrayList<>();
-            for (int i = 0; i < votes.size(); i++) {
-                VoteDO vote = votes.get(i);
-                VoteDO vote1 = getVote(vote);
-                List<VoteElectDO> elects = voteElectMapper.selectElectByStuId(stuId, vote1.getVoteId());
-                if (ObjectUtils.isNotEmpty(elects)) {
-                    vote1.setVoteStatus(3);
+        if (longs.size()>0){
+            List<Long> voteIds = new ArrayList<>();
+            voteIds.addAll(longs);
+            List<VoteDO> votes = voteMapper.selectVoteListByVoteIds(voteIds, pageStart, pageSize, voteType);
+            if (ObjectUtils.isNotEmpty(votes)) {
+                List<VoteDO> votes1 = new ArrayList<>();
+                for (int i = 0; i < votes.size(); i++) {
+                    VoteDO vote = votes.get(i);
+                    VoteDO vote1 = getVote(vote);
+                    List<VoteElectDO> elects = voteElectMapper.selectElectByStuId(stuId, vote1.getVoteId());
+                    if (ObjectUtils.isNotEmpty(elects)) {
+                        vote1.setVoteStatus(3);
+                    }
+                    votes1.add(vote1);
                 }
-                votes1.add(vote1);
+                return votes1;
+            } else {
+                throw new Exception("暂时没有投票单");
             }
-            return votes1;
-        } else {
+        }else {
             throw new Exception("暂时没有投票单");
         }
+
     }
 
 

frontend/wechat-web/src/modules/album/NewAlbum.jsx

@@ -176,6 +176,11 @@ class NewAlbum extends Component {
             return
         }
 
+        if (albumTitle.length > 50) {
+            Toast.fail('相册标题过长')
+            return
+        }
+
         const {classList, classText} = this.state
 
         if (classList[classText]) {

frontend/wechat-web/src/modules/hiPages/send-vote/SendVote.js

@@ -247,7 +247,7 @@ class SendVote extends Component {
         if (this.isRequesting == true) {
             return
         }
-        this.isRequesting = true
+
         const stuList = [], teacherList = []
         if (!isObjEmpty(this.checkNodes)) {
             this.checkNodes.forEach((node, index) => {
@@ -340,7 +340,7 @@ class SendVote extends Component {
         console.log('params', {
             voteString: params
         })
-
+        this.isRequesting = true
         Toast.loading('投票发布中...', 0)
         fetchPost(API.voteCreate, {
             voteString: JSON.stringify(params)