diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java index a9e3ecd..1a55f9a 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppCompanyController.java @@ -18,7 +18,6 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; /** diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java index c3882a5..d5f6d77 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java @@ -3,13 +3,10 @@ package com.ruoyi.cms.controller.app; import com.ruoyi.cms.domain.ESJobDocument; import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.query.ESJobSearch; -import com.ruoyi.cms.domain.vo.CompetitivenessResponse; -import com.ruoyi.cms.domain.vo.RadarChart; import com.ruoyi.cms.service.IESJobSearchService; import com.ruoyi.cms.service.IJobCollectionService; import com.ruoyi.cms.service.IJobService; import com.ruoyi.common.annotation.BussinessLog; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; @@ -21,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Random; /** * 岗位Controller diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppScriptController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppScriptController.java index 5aaf430..bdc1461 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppScriptController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppScriptController.java @@ -1,27 +1,15 @@ package com.ruoyi.cms.controller.app; -import com.ruoyi.cms.domain.ESJobDocument; -import com.ruoyi.cms.domain.Job; -import com.ruoyi.cms.domain.query.ESJobSearch; -import com.ruoyi.cms.domain.vo.CompetitivenessResponse; -import com.ruoyi.cms.domain.vo.RadarChart; import com.ruoyi.cms.service.ICompanyService; -import com.ruoyi.cms.service.IESJobSearchService; -import com.ruoyi.cms.service.IJobCollectionService; import com.ruoyi.cms.service.IJobService; -import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.dromara.easyes.core.biz.EsPageInfo; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Random; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; /** * 岗位Controller diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index 5ca9504..f17378f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -61,7 +61,7 @@ public class CmsJobController extends BaseController * 导出岗位列表 */ @ApiOperation("导出岗位列表") - @PreAuthorize("@ss.hasPermi('app:job:export')") + @PreAuthorize("@ss.hasPermi('bussiness:job:export')") @Log(title = "岗位", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, Job job) @@ -74,7 +74,7 @@ public class CmsJobController extends BaseController * 新增岗位 */ @ApiOperation("新增岗位") - @PreAuthorize("@ss.hasPermi('app:job:add')") + @PreAuthorize("@ss.hasPermi('bussiness:job:add')") @Log(title = "岗位", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Job job) @@ -86,7 +86,7 @@ public class CmsJobController extends BaseController * 修改岗位 */ @ApiOperation("修改岗位") - @PreAuthorize("@ss.hasPermi('app:job:edit')") + @PreAuthorize("@ss.hasPermi('bussiness:job:edit')") @Log(title = "岗位", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Job job) @@ -98,7 +98,7 @@ public class CmsJobController extends BaseController * 删除岗位 */ @ApiOperation("删除岗位") - @PreAuthorize("@ss.hasPermi('app:job:remove')") + @PreAuthorize("@ss.hasPermi('bussiness:job:remove')") @Log(title = "岗位", businessType = BusinessType.DELETE) @DeleteMapping("/{jobIds}") public AjaxResult remove(@PathVariable Long[] jobIds) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index 0ae7fa9..0de4d1c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -81,7 +81,7 @@ left join sys_user_role ur on rm.role_id = ur.role_id left join sys_role ro on ur.role_id = ro.role_id left join sys_user u on ur.user_id = u.user_id - where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = 0 + where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0 AND ro.status = '0' order by m.parent_id, m.order_num diff --git a/sql/highgo_function.sql b/sql/highgo_function.sql new file mode 100644 index 0000000..02b41df --- /dev/null +++ b/sql/highgo_function.sql @@ -0,0 +1,53 @@ +CREATE OR replace function ks_db4.generate_subscripts(anyarray,int) + +RETURNS SETOF int AS $$ + +begin + +SELECT generate_series(array_lower($1,$2), array_upper($1,$2)); + +end + +$$ LANGUAGE plpgsql; + + + + +CREATE OR REPLACE FUNCTION ks_db4.find_in_set(str integer, strlist text) + +RETURNS boolean AS $$ + +SELECT i > 0 + +FROM generate_subscripts(string_to_array($2,','),1) g(i) + +WHERE (string_to_array($2, ','))[i] = $1::text + +$$ LANGUAGE sql STRICT; + + +CREATE OR REPLACE FUNCTION ks_db4.find_in_set(str bigint, strlist text) + +RETURNS boolean AS $$ + +SELECT i > 0 + +FROM generate_subscripts(string_to_array($2,','),1) g(i) + +WHERE (string_to_array($2, ','))[i] = $1::text + +$$ LANGUAGE sql STRICT; + + + +CREATE OR REPLACE FUNCTION ks_db4.find_in_set(str text, strlist text) + +RETURNS boolean AS $$ + +SELECT i > 0 + +FROM generate_subscripts(string_to_array($2,','),1) g(i) + +WHERE (string_to_array($2, ','))[i] = $1 + +$$ LANGUAGE sql STRICT; \ No newline at end of file