Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/增量脚本.sql

@@ -1,2 +1,9 @@
-INSERT INTO `soc`.`sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2197, '导出', 2073, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:export', '1', '#', NULL, '超级管理员', '2023-09-14 16:10:03', '', NULL, '');
-INSERT INTO `soc`.`sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2198, '详情', 2073, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:query', '1', '#', NULL, '超级管理员', '2023-09-14 16:10:35', '超级管理员', '2023-09-14 19:26:20', '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2197, '导出', 2073, 1, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:export', '1', '#', NULL, '超级管理员', '2023-09-14 16:10:03', '', NULL, '');
+INSERT INTO `sys_menu`(`id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `platform_type`, `icon`, `image_path`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2198, '详情', 2073, 2, '', NULL, NULL, 1, 0, 'F', '0', '0', 'core:task:query', '1', '#', NULL, '超级管理员', '2023-09-14 16:10:35', '超级管理员', '2023-09-14 19:26:20', '');
+
+-- 修改教育培训菜单名称
+update sys_menu set menu_name ='安全教育' where id=2127;
+update sys_menu set menu_name ='知识库标签管理' where id=2038;
+update sys_menu set menu_name ='上传学习资料' where id=2045;
+update sys_menu set menu_name ='培训计划管理' where id=2059;
+update sys_menu set menu_name ='培训任务管理' where id=2079;

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysOrgExtend.java

@@ -60,14 +60,14 @@ public class SysOrgExtend extends BaseEntity {
      * 是否自有产权
      */
     @ApiModelProperty(value = "是否自有产权")
-//    @JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long ownership;
 
     /**
      * 是否区域外
      */
     @ApiModelProperty(value = "是否区域外")
-//    @JsonSerialize(using = ToStringSerializer.class)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long outsideArea;
 
     /**

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/vo/SysOrgVO.java

@@ -29,7 +29,7 @@ public class SysOrgVO {
     private Integer type;
     private String shortName;
     private String treeShowPath;
-    private Integer sort;
+    private Integer sort=0;
     @JsonSerialize(using = ToStringSerializer.class)
     private Long treeShowParentId;
     private List<SysOrgVO> children = new ArrayList<SysOrgVO>();
@@ -37,7 +37,7 @@ public class SysOrgVO {
 
     public List<SysOrgVO> getChildren() {
         if(children.size() > 0) {
-            children.stream().sorted(Comparator.comparing(SysOrgVO::getSort).reversed()).collect(Collectors.toList());
+            children.sort(Comparator.comparing(SysOrgVO::getSort).reversed());
         }
         return children;
     }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeptController.java

@@ -29,8 +29,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
-import static sun.plugin2.os.windows.FLASHWINFO.size;
-
 /**
  * 机构信息
  *

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -629,7 +629,7 @@
                type,
                tree_show_parent_id,
                tree_show_path,
-               sort
+               sort as sort
         FROM sys_org
         WHERE deleted = 0
         ORDER BY isnull(sort),sort, path