Browse Source

登入人部门处理‘,’和‘:’替换

guoyuanquan@mail.taiji.com.cn 8 months ago
parent
commit
f019852a55

+ 6 - 3
cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/DatametaService.java

@@ -88,10 +88,12 @@ public class DatametaService extends BaseService {
 		if (searchParameters != null && searchParameters.size() > 0 && searchParameters.get("pageSize") != null) {
 			pageSize = Integer.parseInt(StringTool.null2Empty(searchParameters.get("pageSize").toString()));
 		}
-		if (pageSize < 1)
+		if (pageSize < 1) {
 			pageSize = 1;
-		if (pageSize > 1001)
+		}
+		if (pageSize > 1001) {
 			pageSize = 1000;
+		}
 		List<Order> orders = new ArrayList<Sort.Order>();
 
 		PageRequest pageable;
@@ -158,7 +160,7 @@ public class DatametaService extends BaseService {
 			        	Predicate[] statList1 = new Predicate[2];
 			        	if(flag_bmsh_role) {
 			        		 In<Object> in = cb.in(root.get("creatorOrg"));
-					            String []strArgs=dto.getCreatorOrg().split(",");
+					            String []strArgs=dto.getCreatorOrg().split(";");
 					            Boolean exist=false; 
 					            //获取当前用户所处机构
 							  for (String st : strArgs) {
@@ -218,6 +220,7 @@ public class DatametaService extends BaseService {
 					return cb.and(pl.toArray(p));
 				}
 			};
+
 			pageList = tdataMetaRepository.findAll(spec, pageable);
 
 		} else {