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

@@ -147,7 +147,7 @@ public class WxUserController {
 		String headimgurl = JSON.parseObject(body).getString("headimgurl");
 		String encode =null;
 		try {
-			encode = URLEncoder.encode(headimgurl.toString(), "ISO-8859-1");
+			encode = URLEncoder.encode(headimgurl, "ISO-8859-1");
 			System.err.println("headimgurl======"+headimgurl);
 			System.err.println("encode======"+encode);
 		} catch (UnsupportedEncodingException e) {

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("暂时没有投票单");
         }
+
     }