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

project_data/sql/0.0.5/soc/soc.sql

@@ -436,3 +436,10 @@ INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value
 INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231114698, 11, '员工着装', '11', 'core_registration_project', NULL, 'default', 'N', '0', '超级管理员', '2023-12-11 16:54:37', '', NULL, '可参考具体制度要求');
 INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231114699, 12, '行为举止', '12', 'core_registration_project', NULL, 'default', 'N', '0', '超级管理员', '2023-12-11 16:54:50', '', NULL, '可参考具体制度要求');
 INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20231114700, 13, '服务质量', '13', 'core_registration_project', NULL, 'default', 'N', '0', '超级管理员', '2023-12-11 16:55:08', '', NULL, '可参考具体制度要求');
+
+
+-- 修正检查登记跟踪菜单权限
+update sys_menu set perms="core:safetytask:list" WHERE menu_name ="检查登记跟踪" and platform_type=1;
+update sys_menu set perms="core:safetytask:list" WHERE parent_id in (SELECT id from (SELECT id from sys_menu WHERE  menu_name ="检查登记跟踪" and platform_type=1) a) and menu_name ="列表" and platform_type=1;
+update sys_menu set perms="core:safetytask:query" WHERE parent_id in (SELECT id from (SELECT id from sys_menu WHERE  menu_name ="检查登记跟踪" and platform_type=1) a) and menu_name ="详细信息" and platform_type=1;
+DELETE FROM sys_menu where  parent_id in (SELECT id from (SELECT id from sys_menu WHERE  menu_name ="检查登记跟踪" and platform_type=1) a) and menu_name in("新增","修改") and platform_type=1;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafetyTaskController.java

@@ -58,7 +58,7 @@ public class CoreSafetyTaskController extends BaseController {
      * 查询【请填写功能名称】列表
      */
     @ApiOperation(value = "查询CoreSafetyTask列表")
-    @RequiresPermissions("core:task:list")
+    @RequiresPermissions("core:safetytask:list")
     @GetMapping("/list")
     public TableDataInfo<CoreSafetyTask> list(CoreSafetyTask coreSafetyTask) {
 
@@ -66,7 +66,7 @@ public class CoreSafetyTaskController extends BaseController {
     }
 
     @ApiOperation(value = "删除任务")
-    @RequiresPermissions("core:task:list")
+//    @RequiresPermissions("core:task:list")
     @DeleteMapping("/task/{taskId}")
     public AjaxResult remove(@PathVariable @NotNull Long taskId) {
         boolean b = coreSafetyTaskService.removeById(taskId);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -835,6 +835,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         OrgTypeEnum orgTypeEnum = OrgTypeEnum.getOrgTypeEnum(org.getType());
         LambdaQueryWrapper<SysOrg> wrapper = new LambdaQueryWrapper<SysOrg>();
         wrapper.notLike(SysOrg::getName, "各部门").notLike(SysOrg::getShortName, "各部门").isNotNull(SysOrg::getPath);
+        wrapper.eq(SysOrg::getIsLock,0);
 
         switch (orgTypeEnum) {
             case SHEGN_LIAN_SHE: