|
@@ -314,6 +314,9 @@ public class personnelstatistics extends Controller {
|
|
|
if(!((JSONArray)jsonObjectResult.get("mx")).isEmpty()){
|
|
|
stringBuffer.append(" or t1.subclass in"+ jsonObjectResult.get("mx"));
|
|
|
}
|
|
|
+ if(((JSONArray)jsonObjectResult.get("mx")).isEmpty() && ((JSONArray)jsonObjectResult.get("type")).isEmpty()){
|
|
|
+ stringBuffer.append(" 1=1 ");
|
|
|
+ }
|
|
|
where1= where1+ " and ("+(stringBuffer.toString()).replaceFirst("or", "")+")";
|
|
|
where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
}
|
|
@@ -589,6 +592,9 @@ public class personnelstatistics extends Controller {
|
|
|
if(!((JSONArray)jsonObjectResult.get("mx")).isEmpty()){
|
|
|
stringBuffer.append(" or t1.subclass in"+ jsonObjectResult.get("mx"));
|
|
|
}
|
|
|
+ if(((JSONArray)jsonObjectResult.get("mx")).isEmpty() && ((JSONArray)jsonObjectResult.get("type")).isEmpty()){
|
|
|
+ stringBuffer.append(" 1=1 ");
|
|
|
+ }
|
|
|
where1= where1+ " and ("+(stringBuffer.toString()).replaceFirst("or", "")+")";
|
|
|
where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
}
|
|
@@ -838,6 +844,9 @@ public class personnelstatistics extends Controller {
|
|
|
if(!((JSONArray)jsonObjectResult.get("mx")).isEmpty()){
|
|
|
stringBuffer.append(" or t1.subclass in"+ jsonObjectResult.get("mx"));
|
|
|
}
|
|
|
+ if(((JSONArray)jsonObjectResult.get("mx")).isEmpty() && ((JSONArray)jsonObjectResult.get("type")).isEmpty()){
|
|
|
+ stringBuffer.append(" 1=1 ");
|
|
|
+ }
|
|
|
where1= where1+ " and ("+(stringBuffer.toString()).replaceFirst("or", "")+")";
|
|
|
where1 = where1.replace("[", "(").replace("]", ")");
|
|
|
}
|