feats

src/main/java/com/yunzhi/liyuanhui/controller/TaGalleryController.java

@@ -53,6 +53,7 @@ public class TaGalleryController extends BaseController {
         QueryWrapper<TaGallery> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(!StringUtils.isEmpty(typeId), "type_id", typeId);
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByDesc("type_id");
         queryWrapper.orderByDesc("create_date");
 
         IPage<TaGallery> result = iTaGalleryService.page(pg, queryWrapper);
@@ -79,7 +80,7 @@ public class TaGalleryController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taGallery/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/gallery/{id}", method= RequestMethod.DELETE)
     public ResponseBean taGalleryDelete(@PathVariable Integer id) throws Exception{
 
         if(iTaGalleryService.removeById(id)){

src/main/java/com/yunzhi/liyuanhui/controller/TaPersonController.java

@@ -55,7 +55,7 @@ public class TaPersonController extends BaseController {
         IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
-        queryWrapper.nested(q -> q.like(!StringUtils.isEmpty(name), "name", name).or().like(!StringUtils.isEmpty(name), "nickname", name));
+        queryWrapper.nested(!StringUtils.isEmpty(name), q -> q.like("name", name).or().like("nickname", name));
         queryWrapper.like(!StringUtils.isEmpty(name), "name", name);
         queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
         queryWrapper.orderByDesc("create_date");

src/main/java/com/yunzhi/liyuanhui/entity/TaAdvert.java

@@ -59,6 +59,11 @@ public class TaAdvert implements Serializable {
      */
     private String srcId;
 
+    /**
+     * 资源名称
+     */
+    private String srcName;
+
     /**
      * 状态
      */
@@ -73,6 +78,4 @@ public class TaAdvert implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
-
-
 }