Merge branch 'app-version-mark' into dev

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionMarkController.java

@@ -79,11 +79,12 @@ public class AppVersionMarkController extends BaseController<AppVersionMarkBiz,
     @GetMapping("/findAllByQuery")
     public ObjectRestResponse findAllByQuery(@RequestParam(value = "page", defaultValue = "1") Integer page,
                                              @RequestParam(value = "limit", defaultValue = "10") Integer limit,
-                                             @RequestParam(value = "mark",defaultValue = "") String mark) {
+                                             @RequestParam(value = "mark", defaultValue = "") String mark) {
         Example example = new Example(AppVersionMark.class);
         if (StringUtils.isNotBlank(mark)) {
             example.createCriteria().andLike("mark", "%" + mark + "%");
         }
+        example.createCriteria().andEqualTo("isDel", 0);
         example.setOrderByClause("`crt_time` desc");
         PageHelper.startPage(page, limit);
         List<AppVersionMark> listPage = appVersionMarkBiz.selectByExample(example);

xx-app/xx-app-server/src/main/resources/mapper/AppVersionMarkMapper.xml

@@ -11,7 +11,7 @@
         where
         is_del=0
         <if test="mark!=null and mark!=''">
-            and mark like concat('%',#{mark},'%')
+            and  binary mark like concat('%',#{mark},'%')
         </if>
     </select>
 
@@ -22,7 +22,7 @@
         where
         is_del = 0
         <if test="mark!=null and mark!=''">
-            and mark like concat('%',#{mark},'%')
+            and binary mark like concat('%',#{mark},'%')
         </if>
     </select>