update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/RejectHistorySearchQuery.java

@@ -20,7 +20,7 @@ public class RejectHistorySearchQuery extends BaseQuery<RejectHistory> {
 
     private String secretNumber;
 
-    private int groupNumber;
+    private Integer groupNumber;
 
     private Integer headerId;
 
@@ -82,11 +82,11 @@ public class RejectHistorySearchQuery extends BaseQuery<RejectHistory> {
         this.secretNumber = secretNumber;
     }
 
-    public int getGroupNumber() {
+    public Integer getGroupNumber() {
         return groupNumber;
     }
 
-    public void setGroupNumber(int groupNumber) {
+    public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
 

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/RejectHistoryServiceImpl.java

@@ -67,7 +67,7 @@ public class RejectHistoryServiceImpl extends BaseQueryService<RejectHistory> im
                 if (query.getMarkerId() > 0) {
                     predicates.add(cb.equal(root.get("markerId"), query.getMarkerId()));
                 }
-                if (query.getGroupNumber() > 0) {
+                if (query.getGroupNumber() != null) {
                     predicates.add(cb.equal(root.get("groupNumber"), query.getGroupNumber()));
                 }
                 if (StringUtils.isNotBlank(query.getRejectReason())) {

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/service/impl/UserServiceImpl.java

@@ -330,10 +330,17 @@ public class UserServiceImpl implements UserService {
                 user = new User();
                 user.setLoginName(loginName);
                 user.setName(loginName);
-                if (StringUtils.isNotBlank(password)) {
+                if (random) {
+                    int i = (int) (Math.random() * 9000);
+                    password = String.valueOf(i + 1000);
                     user.setPassword(EncryptUtils.md5(password));
+                    user.setRandomPassword(password);
                 } else {
-                    user.setPassword(EncryptUtils.md5(USER_PASSWORD));
+                    if (StringUtils.isNotBlank(password)) {
+                        user.setPassword(EncryptUtils.md5(password));
+                    } else {
+                        user.setPassword(EncryptUtils.md5(USER_PASSWORD));
+                    }
                 }
                 user.setRole(role);
                 user.setSource(UserSource.INTERNAL);

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/questionAdd.jsp

@@ -72,7 +72,7 @@
 		<div class="control-group">
 			<label class="control-label">大题昵称</label>
 			<div class="controls">
-			 <input name="name" value="${examQuestion.name }" type="text"  maxlength="32" class="required"/>
+			 <input name="name" value="${examQuestion.name }" type="text"  maxlength="32"/>
 			</div>
 		</div>
 		<div class="control-group">

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/rejectHistory.jsp

@@ -114,7 +114,6 @@
         $('#subject-select').change(function () {
             var code = $(this).val();
             $('#group-select').empty();
-            $("<option value=''>请选择</option>").appendTo('#group-select');
             if (code == '') {
                 $('#group-select').val('').trigger('change');
                 return;
@@ -123,15 +122,15 @@
             $.post('${ctx}/admin/exam/group/query', {subjectCode: code, status: 'FORMAL'}, function (result) {
                 var parent = $('#group-select');
                 var first = '';
-                $('<option value="">不限</option>').appendTo(parent);
+                $('<option value="">请选择</option>').appendTo(parent);
                 for (var i = 0; i < result.length; i++) {
                     var group = result[i];
                     $('<option value="' + group.number + '">' + group.number + '-' + group.title + '</option>').appendTo(parent);
-                    if (i == 0) {
+                    /* if (i == 0) {
                         first = group.number;
-                    }
+                    } */
                 }
-                parent.val(first).trigger('change');
+                parent.val(first).trigger('change'); 
             });
             
             $('#marker-select').empty();

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/rejectList.jsp

@@ -118,7 +118,6 @@
         $('#subject-select').change(function () {
             var code = $(this).val();
             $('#group-select').empty();
-            $("<option value=''>请选择</option>").appendTo('#group-select');
             if (code == '') {
                 $('#group-select').val('').trigger('change');
                 return;
@@ -127,15 +126,15 @@
             $.post('${ctx}/admin/exam/group/query', {subjectCode: code, status: 'FORMAL'}, function (result) {
                 var parent = $('#group-select');
                 var first = '';
-                $('<option value="">不限</option>').appendTo(parent);
+                $('<option value="">请选择</option>').appendTo(parent);
                 for (var i = 0; i < result.length; i++) {
                     var group = result[i];
                     $('<option value="' + group.number + '">' + group.number + '-' + group.title + '</option>').appendTo(parent);
-                    if (i == 0) {
+                    /* if (i == 0) {
                         first = group.number;
-                    }
+                    } */
                 }
-                parent.val(first).trigger('change');
+               parent.val(first).trigger('change');
             });
             
             $('#marker-select').empty();

stmms-web/src/main/webapp/WEB-INF/views/modules/report/reportSubjectRange.jsp

@@ -47,7 +47,7 @@
          
         <input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()" data-i18n-value="report.group.search"/>
 		<c:if test="${query.subjectCode!=null && oldSubjectCode!=null}">
-		<a id="refresh" href="${ctx}/admin/exam/reportSubjectRange/report?subjectCode=${query.subjectCode}" class="btn" <c:if test="${locked}">disabled="disabled"</c:if>>刷新</a>
+		<a id="refresh" href="<c:if test="${locked}">#</c:if><c:if test="${!locked}">${ctx}/admin/exam/reportSubjectRange/report?subjectCode=${query.subjectCode}</c:if>" class="btn" <c:if test="${locked}">disabled="disabled"</c:if>>刷新</a>
 		</c:if>
 		&nbsp;
 		<div class="btn-group">