anderx 3 éve%!(EXTRA string=óta)
szülő
commit
c9d5710e5c

+ 5 - 0
src/main/java/com/goafanti/common/utils/StringUtils.java

@@ -42,4 +42,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 		}
 		return false;
 	}
+
+	public static void main(String[] args) {
+
+		System.out.println(isContainChinese("91430100060111212G"));
+	}
 }

+ 2 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -215,14 +215,15 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	public Pagination<CustomerListOut> listAllOrganizationCustomer(CustomerListIn cli, Integer pageNo,
 			Integer pageSize) {
 		cli.setType(AFTConstants.USER_TYPE_ORGANIZATION);
-		Map<String, Object> params = disposeParams(cli);
 		String name=null;
 		String orgCode=null;
 		if (StringUtils.isContainChinese(cli.getName())){
 			name= cli.getName();
 		}else {
 			orgCode= cli.getName();
+			cli.setName(null);
 		}
+		Map<String, Object> params = disposeParams(cli);
 		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)) {
 			params.put("role", 1);
 			if (name!=null)params.put("name",name);