eganwu 1 anno fa
parent
commit
5b1867357c

+ 10 - 8
src/custom/restcontroller/webmanage/saletool/courseware/courseware.java

@@ -172,17 +172,19 @@ public class courseware extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("sat_courseware_classids") && !"".equals(whereObject.getString("sat_courseware_classids"))) {
-                where.append(" and (1=2");
                 JSONArray sat_courseware_classids = whereObject.getJSONArray("sat_courseware_classids");
-                for (Object obj : sat_courseware_classids) {
-                    JSONArray array = (JSONArray) obj;
-                    for (Object obj2 : array) {
-                        where.append(" or (");
-                        where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
-                        where.append(")");
+                if(sat_courseware_classids.size()>0) {
+                    where.append(" and (1=2");
+                    for (Object obj : sat_courseware_classids) {
+                        JSONArray array = (JSONArray) obj;
+                        for (Object obj2 : array) {
+                            where.append(" or (");
+                            where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
+                            where.append(")");
+                        }
                     }
+                    where.append(")");
                 }
-                where.append(")");
             }
             if (whereObject.containsKey("begindate_create") && !"".equals(whereObject.getString("begindate_create"))) {
                 where.append(" and (");

+ 20 - 6
src/custom/restcontroller/webmanage/saletool/courseware/coursewaredetail.java

@@ -339,9 +339,16 @@ public class coursewaredetail extends Controller {
             if (whereObject.containsKey("sat_courseware_classids") && !"".equals(whereObject.getString("sat_courseware_classids"))) {
 
                 JSONArray sat_courseware_classids = whereObject.getJSONArray("sat_courseware_classids");
-                for (Object obj : sat_courseware_classids) {
-                    where.append(" and (");
-                    where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj + "')");
+                if(sat_courseware_classids.size()>0) {
+                    where.append(" and (1=2");
+                    for (Object obj : sat_courseware_classids) {
+                        JSONArray array = (JSONArray) obj;
+                        for (Object obj2 : array) {
+                            where.append(" or (");
+                            where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
+                            where.append(")");
+                        }
+                    }
                     where.append(")");
                 }
             }
@@ -394,9 +401,16 @@ public class coursewaredetail extends Controller {
             if (whereObject.containsKey("sat_courseware_classids") && !"".equals(whereObject.getString("sat_courseware_classids"))) {
 
                 JSONArray sat_courseware_classids = whereObject.getJSONArray("sat_courseware_classids");
-                for (Object obj : sat_courseware_classids) {
-                    where.append(" and (");
-                    where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj + "')");
+                if(sat_courseware_classids.size()>0) {
+                    where.append(" and (1=2");
+                    for (Object obj : sat_courseware_classids) {
+                        JSONArray array = (JSONArray) obj;
+                        for (Object obj2 : array) {
+                            where.append(" or (");
+                            where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
+                            where.append(")");
+                        }
+                    }
                     where.append(")");
                 }
             }

+ 10 - 8
src/custom/restcontroller/webmanage/saletool/courseware/coursewaretesthead.java

@@ -243,17 +243,19 @@ public class coursewaretesthead extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("sat_courseware_classids") && !"".equals(whereObject.getString("sat_courseware_classids"))) {
-                where.append(" and (1=2");
                 JSONArray sat_courseware_classids = whereObject.getJSONArray("sat_courseware_classids");
-                for (Object obj : sat_courseware_classids) {
-                    JSONArray array = (JSONArray) obj;
-                    for (Object obj2 : array) {
-                        where.append(" or (");
-                        where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
-                        where.append(")");
+                if(sat_courseware_classids.size()>0) {
+                    where.append(" and (1=2");
+                    for (Object obj : sat_courseware_classids) {
+                        JSONArray array = (JSONArray) obj;
+                        for (Object obj2 : array) {
+                            where.append(" or (");
+                            where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
+                            where.append(")");
+                        }
                     }
+                    where.append(")");
                 }
-                where.append(")");
             }
             if (whereObject.containsKey("begindate_create") && !"".equals(whereObject.getString("begindate_create"))) {
                 where.append(" and (");

+ 10 - 8
src/custom/restcontroller/webmanage/saletool/courseware/coursewaretestlibrary.java

@@ -130,17 +130,19 @@ public class coursewaretestlibrary extends Controller {
                 where.append(")");
             }
             if (whereObject.containsKey("sat_courseware_classids") && !"".equals(whereObject.getString("sat_courseware_classids"))) {
-                where.append(" and (1=2");
                 JSONArray sat_courseware_classids = whereObject.getJSONArray("sat_courseware_classids");
-                for (Object obj : sat_courseware_classids) {
-                    JSONArray array = (JSONArray) obj;
-                    for (Object obj2 : array) {
-                        where.append(" or (");
-                        where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
-                        where.append(")");
+                if(sat_courseware_classids.size()>0) {
+                    where.append(" and (1=2");
+                    for (Object obj : sat_courseware_classids) {
+                        JSONArray array = (JSONArray) obj;
+                        for (Object obj2 : array) {
+                            where.append(" or (");
+                            where.append("JSON_CONTAINS(t1.sat_courseware_classids,'" + obj2 + "')");
+                            where.append(")");
+                        }
                     }
+                    where.append(")");
                 }
-                where.append(")");
             }
             if (whereObject.containsKey("begindate") && !"".equals(whereObject.getString("begindate"))) {
                 where.append(" and (");