Merge branch 'dev_policy_service' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java

@@ -183,7 +183,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver {
             return ">=";
         }
 
-        return "";
+        return oldRel;
     }
 
     /**

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -116,7 +116,16 @@
             <if test="resiRules != null and resiRules.size() > 0">
                 and
                 <foreach collection="resiRules" item="rule" open="(" close=")">
-                    ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.nextLogicalRel}
+                    ${rule.colTable}.${rule.colKey} ${rule.queryType}
+                    <choose>
+                        <when test="rule.queryType == 'like'">
+                            CONCAT('%',#{rule.colVal} ,'%')
+                        </when>
+                        <otherwise>
+                            #{rule.colVal}
+                        </otherwise>
+                    </choose>
+                    ${rule.nextLogicalRel}
                 </foreach>
             </if>
         </where>