Merge branch 'dev' into pre-production

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -94,12 +94,12 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 
 	@Override
 	public IPage<ClassifyVO> pageList(IPage<Object> page, Map<String, Object> classify) {
-		Long pId = (Long) classify.get("pId");
+		String pId = (String) classify.get("pid");
 		String name = (String) classify.get("name");
 		String isPid = (String) classify.get("isPid");
 
 		ClassifyDTO classifyDTO = new ClassifyDTO();
-		classifyDTO.setPId(pId);
+		classifyDTO.setPId(Long.parseLong(pId));
 		classifyDTO.setName(name);
 		classifyDTO.setIsPid(Integer.parseInt(isPid));
 
@@ -260,7 +260,6 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		return R.status(true);
 	}
 
-	@Transactional
 	private void handleResource(List<Map<String, Object>> resourceList, Long id) {
 		for (Map<String, Object> map : resourceList) {
 			IndicatorsAnnexEntity indicatorsAnnexEntity = Func.copy(map, IndicatorsAnnexEntity.class);