From df7be169baa277411666b38e72362c08be5730be Mon Sep 17 00:00:00 2001 From: hewei Date: Tue, 13 Jun 2017 11:35:23 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20Selective=E5=A2=9E=E5=BC=BA=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=AF=B9=E4=BA=8E=E4=B8=BB=E9=94=AE=E4=B8=BA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=98=AF=E6=B2=A1=E6=9C=89if?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=9A=84=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=BF=9B=E8=A1=8CisSelective()=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugins/SelectiveEnhancedPlugin.java | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPlugin.java b/src/main/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPlugin.java index 9fea446..c11b54d 100644 --- a/src/main/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPlugin.java +++ b/src/main/java/com/itfsw/mybatis/generator/plugins/SelectiveEnhancedPlugin.java @@ -232,37 +232,42 @@ public class SelectiveEnhancedPlugin extends BasePlugin { XmlElement whenEle = new XmlElement("when"); whenEle.addAttribute(new Attribute("test", prefix + "isSelective()")); for (Element ele : element.getElements()) { - // if的text节点 - XmlElement xmlElement = (XmlElement) ele; - TextElement textElement = (TextElement) xmlElement.getElements().get(0); + // 对于字符串主键,是没有if判断节点的 + if (ele instanceof XmlElement){ + // if的text节点 + XmlElement xmlElement = (XmlElement) ele; + TextElement textElement = (TextElement) xmlElement.getElements().get(0); - // 找出field 名称 - String text = textElement.getContent().trim(); - String field = ""; - if (text.matches(".*\\s*=\\s*#\\{.*\\},?")) { - Pattern pattern = Pattern.compile("(.*?)\\s*=\\s*#\\{.*},?"); - Matcher matcher = pattern.matcher(text); - if (matcher.find()){ - field = matcher.group(1); - } - } else if (text.matches("#\\{.*\\},?")) { - Pattern pattern = Pattern.compile("#\\{(.*?),.*\\},?"); - Matcher matcher = pattern.matcher(text); - if (matcher.find()){ - field = matcher.group(1); + // 找出field 名称 + String text = textElement.getContent().trim(); + String field = ""; + if (text.matches(".*\\s*=\\s*#\\{.*\\},?")) { + Pattern pattern = Pattern.compile("(.*?)\\s*=\\s*#\\{.*},?"); + Matcher matcher = pattern.matcher(text); + if (matcher.find()){ + field = matcher.group(1); + } + } else if (text.matches("#\\{.*\\},?")) { + Pattern pattern = Pattern.compile("#\\{(.*?),.*\\},?"); + Matcher matcher = pattern.matcher(text); + if (matcher.find()){ + field = matcher.group(1); + } + } else { + field = text.replaceAll(",", ""); } + + XmlElement ifEle = new XmlElement("if"); + + // bug fixed: 修正使用autoDelimitKeywords过滤关键词造成的field前后加了特殊字符的问题 + field = field.replaceAll("`", "").replaceAll("\"", "").replaceAll("'", ""); + + ifEle.addAttribute(new Attribute("test", prefix + "isSelective(\'" + field + "\')")); + ifEle.addElement(textElement); + whenEle.addElement(ifEle); } else { - field = text.replaceAll(",", ""); + whenEle.addElement(ele); } - - XmlElement ifEle = new XmlElement("if"); - - // bug fixed: 修正使用autoDelimitKeywords过滤关键词造成的field前后加了特殊字符的问题 - field = field.replaceAll("`", "").replaceAll("\"", "").replaceAll("'", ""); - - ifEle.addAttribute(new Attribute("test", prefix + "isSelective(\'" + field + "\')")); - ifEle.addElement(textElement); - whenEle.addElement(ifEle); } // otherwise