张延森 пре 4 година
родитељ
комит
2434b9b3e9

+ 2
- 1
src/main/java/com/yunzhi/liyuanhui/controller/TaGalleryController.java Прегледај датотеку

53
         QueryWrapper<TaGallery> queryWrapper = new QueryWrapper<>();
53
         QueryWrapper<TaGallery> queryWrapper = new QueryWrapper<>();
54
         queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
54
         queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
55
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
55
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
56
+        queryWrapper.orderByDesc("type_id");
56
         queryWrapper.orderByDesc("create_date");
57
         queryWrapper.orderByDesc("create_date");
57
 
58
 
58
         IPage<TaGallery> result = iTaGalleryService.page(pg, queryWrapper);
59
         IPage<TaGallery> result = iTaGalleryService.page(pg, queryWrapper);
79
      * @param id  实体ID
80
      * @param id  实体ID
80
      */
81
      */
81
     @ResponseBody
82
     @ResponseBody
82
-    @RequestMapping(value="/taGallery/{id}", method= RequestMethod.DELETE)
83
+    @RequestMapping(value="/admin/gallery/{id}", method= RequestMethod.DELETE)
83
     public ResponseBean taGalleryDelete(@PathVariable Integer id) throws Exception{
84
     public ResponseBean taGalleryDelete(@PathVariable Integer id) throws Exception{
84
 
85
 
85
         if(iTaGalleryService.removeById(id)){
86
         if(iTaGalleryService.removeById(id)){

+ 1
- 1
src/main/java/com/yunzhi/liyuanhui/controller/TaPersonController.java Прегледај датотеку

55
         IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
55
         IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
56
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
56
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
57
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
57
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
58
-        queryWrapper.nested(q -> q.like(!StringUtils.isEmpty(name), "name", name).or().like(!StringUtils.isEmpty(name), "nickname", name));
58
+        queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
59
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
59
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
60
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
60
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
61
         queryWrapper.orderByDesc("create_date");
61
         queryWrapper.orderByDesc("create_date");

+ 5
- 2
src/main/java/com/yunzhi/liyuanhui/entity/TaAdvert.java Прегледај датотеку

59
      */
59
      */
60
     private String srcId;
60
     private String srcId;
61
 
61
 
62
+    /**
63
+     * 资源名称
64
+     */
65
+    private String srcName;
66
+
62
     /**
67
     /**
63
      * 状态
68
      * 状态
64
      */
69
      */
73
      * 创建时间
78
      * 创建时间
74
      */
79
      */
75
     private LocalDateTime createDate;
80
     private LocalDateTime createDate;
76
-
77
-
78
 }
81
 }