update code bug 0608 v1

cjy-mini-project/src/main/java/com/cjy/app/controller/ScenicSpotController.java

@@ -70,21 +70,21 @@ public class ScenicSpotController extends BaseController {
      * @param touristInfo
      * @return
      */
-    @GetMapping("/scenicSpotSortlist")
-    public AjaxResult scenicSpotSortlist(TouristInfo touristInfo) {
+    @GetMapping("/scenicSpotSortList")
+    public AjaxResult scenicSpotSortList(TouristInfo touristInfo) {
         touristInfo.setOrganCode(getUserOrganCode());
         touristInfo.setStatus(USE.getValue());
         List<ScenicSpotSortInfoVO> scenicInfoVOS = touristInfoService.selectScenicSpotSortInfoList(touristInfo);
         return success(scenicInfoVOS);
     }
     /**
-     * 获取景点排序列表
+     * 景点排序
      *
      * @param list
      * @return
      */
-    @PostMapping("/updateScenicSpotSort")
-    public AjaxResult scenicSpotSortlist(@RequestBody List<ScenicSpotSortInfoVO> list) {
+    @PostMapping("/updateScenicSpotSortList")
+    public AjaxResult updateScenicSpotSortList(@RequestBody List<ScenicSpotSortInfoVO> list) {
         return toAjax(touristInfoService.updateScenicSpotSortInfoList(list));
     }
 }

cjy-project/src/main/java/com/cjy/tourist/domain/vo/ScenicSpotSortInfoVO.java

@@ -1,5 +1,7 @@
 package com.cjy.tourist.domain.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.ruoyi.common.annotation.Excel;
 
 /**
@@ -19,6 +21,7 @@ public class ScenicSpotSortInfoVO {
      * 资源编码
      */
     @Excel(name = "资源编码")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long resourceCode;
 
     /**

cjy-project/src/main/java/com/cjy/tourist/service/impl/TouristInfoServiceImpl.java

@@ -254,7 +254,8 @@ public class TouristInfoServiceImpl implements ITouristInfoService {
             // geographyInfo.setResourceCode(touristInfo.getResourceCode());
             // geographyInfoMapper.updateGeographyInfo(geographyInfo);
 
-            GraphicInfo graphicInfo = touristInfo.getGraphicInfo();
+            // GraphicInfo graphicInfo = touristInfo.getGraphicInfo();
+            GraphicInfo graphicInfo = new GraphicInfo();
             BeanUtils.copyProperties(scenicSpotInfoVO, graphicInfo);
             graphicInfo.setUpdateTime(touristInfo.getUpdateTime());
             graphicInfo.setResourceCode(touristInfo.getResourceCode());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -373,6 +373,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
             list.stream().forEach(r -> {
                 DeptVO deptVO = new DeptVO();
                 deptVO.setName(r.getDeptName());
+                deptVO.setPhone(r.getPhone());
                 deptVO.setType("department");
                 deptVO.setId(String.valueOf(r.getDeptId()));
                 if (hasChildByDeptId(Long.parseLong(deptVO.getId()))) {
@@ -384,6 +385,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                     userList.stream().forEach(t -> {
                         DeptVO deptVO2 = new DeptVO();
                         deptVO2.setName(t.getName());
+                        deptVO2.setPhone(t.getPhone());
                         deptVO2.setType("user");
                         deptVO2.setId(String.valueOf(t.getUserId()));
                         userList1.add(deptVO2);

ruoyi-system/src/main/java/com/ruoyi/system/vo/DeptVO.java

@@ -11,8 +11,17 @@ public class DeptVO {
     private String name;
     private String id;
     private String type;
+    private String phone;
     private List<?> children;
 
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     public String getName() {
         return name;
     }