|
@@ -12,6 +12,7 @@ import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
|
|
|
+import org.apache.commons.lang.StringEscapeUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
@@ -503,7 +504,9 @@ public class CameraCtl extends BaseWebCtl {
|
|
|
List<Code> codes = codeService.findByPcode(GlobalData.CODE_XXJ);
|
|
|
for (Code c : codes) {
|
|
|
List<Code> subCodes = codeService.findByPid(c.getId());
|
|
|
- model.addAttribute("code" + c.getCode(), convertToJsonData(subCodes));
|
|
|
+ String jsonString = convertToJsonData(subCodes);
|
|
|
+ jsonString = jsonString.replaceAll("\\\\n", "");
|
|
|
+ model.addAttribute("code" + c.getCode(), jsonString);
|
|
|
}
|
|
|
}
|
|
|
|