Explorar o código

修复绑定科组长代码转大写问题

ting.yin %!s(int64=4) %!d(string=hai) anos
pai
achega
982ee6eefa

+ 6 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/BaseExamController.java

@@ -68,7 +68,12 @@ public class BaseExamController extends BaseController {
 
     protected boolean subjectCheck(String subjectCode, WebUser wu) {
         if (wu.isSubjectHeader()) {
-            return wu.getSubjectCodeSet().contains(subjectCode);
+            for (String code : wu.getSubjectCodeSet()) {
+                if (code.equalsIgnoreCase(subjectCode)) {
+                    return true;
+                }
+            }
+            return false;
         } else {
             return true;
         }

+ 0 - 2
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/MarkTrackController.java

@@ -13,8 +13,6 @@ import cn.com.qmth.stmms.biz.mark.service.MarkLibraryService;
 import cn.com.qmth.stmms.biz.mark.service.MarkSpecialTagService;
 import cn.com.qmth.stmms.biz.mark.service.MarkTrackService;
 import cn.com.qmth.stmms.biz.utils.OriginTag;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -159,7 +159,7 @@ public class UserController extends BaseController {
             for (String value : values) {
                 value = StringUtils.trimToNull(value);
                 if (value != null) {
-                    set.add(value.toUpperCase());
+                    set.add(value);
                 }
             }
         } catch (Exception e) {

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/arbitrateBatchProcess.jsp

@@ -63,9 +63,9 @@
                     needConfirm: false
                 },
                 'arbitration-process': {},
-                'sheet-view': {
+               /*  'sheet-view': {
                     server: '${fileServer}'
-                },
+                }, */
                 'warning-info': {},
                 'thumbnail': {},
                 'view-sidebar': {

+ 2 - 2
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/arbitrateSingleProcess.jsp

@@ -59,9 +59,9 @@
                     needConfirm: false
                 },
                 'arbitration-process': {},
-                'sheet-view': {
+              /*   'sheet-view': {
                     server: '${fileServer}'
-                },
+                }, */
                 'warning-info': {},
                 'thumbnail': {},
                 'view-sidebar': {