Guoyan
/
new_zaojia_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化取消权限校验

jyj_dev2
zhouhaibin 1 month ago
parent
7afc714abe
commit
4520e571bb
5 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ruoyi-admin/src/main/resources/application-dev.yml
  2. 14
      zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java
  3. 14
      zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java
  4. 12
      zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/JyjContractualTaskBatchController.java
  5. 4
      zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml

4
ruoyi-admin/src/main/resources/application-dev.yml
View File

@ -52,8 +52,8 @@ spring:
# url: jdbc:mysql://localhost:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# username: root
# password: root
url: jdbc:mysql://10.1.21.250:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# url: jdbc:mysql://218.0.1.42:53306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# url: jdbc:mysql://10.1.21.250:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://218.0.1.42:53306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# url: jdbc:mysql://10.1.21.251:3306/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
# url: jdbc:mysql://222.75.18.225:2881/jyjtable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root

14
zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualInfoController.java
View File

@ -40,7 +40,7 @@ public class ContractualInfoController extends BaseController {
/**
* 查询合同信息保存列表
*/
@SaCheckPermission("productManagement:ContractualInfo:list")
// @SaCheckPermission("productManagement:ContractualInfo:list")
@GetMapping("/list")
public TableDataInfo<ContractualInfoVo> list(ContractualInfoBo bo, PageQuery pageQuery) {
return ContractualInfoService.queryPageList(bo, pageQuery);
@ -49,7 +49,7 @@ public class ContractualInfoController extends BaseController {
/**
* 导出合同信息保存列表
*/
@SaCheckPermission("productManagement:ContractualInfo:export")
// @SaCheckPermission("productManagement:ContractualInfo:export")
@Log(title = "合同信息保存", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ContractualInfoBo bo, HttpServletResponse response) {
@ -62,13 +62,13 @@ public class ContractualInfoController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("productManagement:ContractualInfo:query")
// @SaCheckPermission("productManagement:ContractualInfo:query")
@GetMapping("/{id}")
public R<ContractualInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(ContractualInfoService.queryById(id));
}
@SaCheckPermission("productManagement:ContractualInfo:query")
// @SaCheckPermission("productManagement:ContractualInfo:query")
@GetMapping("/getInfoByTaskid/{id}")
public R<ContractualInfoVo> getInfoByTaskid(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@ -77,7 +77,7 @@ public class ContractualInfoController extends BaseController {
/**
* 新增合同信息保存
*/
@SaCheckPermission("productManagement:ContractualInfo:add")
// @SaCheckPermission("productManagement:ContractualInfo:add")
@Log(title = "合同信息保存", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -88,7 +88,7 @@ public class ContractualInfoController extends BaseController {
/**
* 修改合同信息保存
*/
@SaCheckPermission("productManagement:ContractualInfo:edit")
// @SaCheckPermission("productManagement:ContractualInfo:edit")
@Log(title = "合同信息保存", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -101,7 +101,7 @@ public class ContractualInfoController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("productManagement:ContractualInfo:remove")
// @SaCheckPermission("productManagement:ContractualInfo:remove")
@Log(title = "合同信息保存", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

14
zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/ContractualProductInfoController.java
View File

@ -43,7 +43,7 @@ public class ContractualProductInfoController extends BaseController {
/**
* 查询合同产品信息列表
*/
@SaCheckPermission("productManagement:ContractualProductInfo:list")
// @SaCheckPermission("productManagement:ContractualProductInfo:list")
@GetMapping("/list")
public TableDataInfo<ContractualProductInfoVo> list(ContractualProductInfoBo bo, PageQuery pageQuery) {
return contractualProductInfoService.queryPageList(bo, pageQuery);
@ -52,7 +52,7 @@ public class ContractualProductInfoController extends BaseController {
/**
* 导出合同产品信息列表
*/
@SaCheckPermission("productManagement:ContractualProductInfo:export")
// @SaCheckPermission("productManagement:ContractualProductInfo:export")
@Log(title = "合同产品信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(ContractualProductInfoBo bo, HttpServletResponse response) {
@ -78,7 +78,7 @@ public class ContractualProductInfoController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("productManagement:ContractualProductInfo:query")
// @SaCheckPermission("productManagement:ContractualProductInfo:query")
@GetMapping("/{id}")
public R<ContractualProductInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@ -89,7 +89,7 @@ public class ContractualProductInfoController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("productManagement:ContractualProductInfo:query")
// @SaCheckPermission("productManagement:ContractualProductInfo:query")
@GetMapping("/getInfoByTaskid/{id}")
public R<List<ContractualProductInfoVo>> getInfoByTaskid(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@ -98,7 +98,7 @@ public class ContractualProductInfoController extends BaseController {
/**
* 新增合同产品信息
*/
@SaCheckPermission("productManagement:ContractualProductInfo:add")
// @SaCheckPermission("productManagement:ContractualProductInfo:add")
@Log(title = "合同产品信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -109,7 +109,7 @@ public class ContractualProductInfoController extends BaseController {
/**
* 修改合同产品信息
*/
@SaCheckPermission("productManagement:ContractualProductInfo:edit")
// @SaCheckPermission("productManagement:ContractualProductInfo:edit")
@Log(title = "合同产品信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -122,7 +122,7 @@ public class ContractualProductInfoController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("productManagement:ContractualProductInfo:remove")
// @SaCheckPermission("productManagement:ContractualProductInfo:remove")
@Log(title = "合同产品信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")

12
zaojiaManagement/zaojia-productManagement/src/main/java/org/dromara/productManagement/controller/JyjContractualTaskBatchController.java
View File

@ -51,7 +51,7 @@ public class JyjContractualTaskBatchController extends BaseController {
/**
* 查询合同批处理记录列表
*/
@SaCheckPermission("productManagement:JyjcontractualTaskBatch:list")
// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:list")
@GetMapping("/list")
public TableDataInfo<JyjContractualTaskBatchVo> list(JyjContractualTaskBatchBo bo, PageQuery pageQuery) {
return jyjContractualTaskBatchService.queryPageList(bo, pageQuery);
@ -73,7 +73,7 @@ public class JyjContractualTaskBatchController extends BaseController {
*
* @param id 主键
*/
@SaCheckPermission("productManagement:JyjcontractualTaskBatch:query")
// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:query")
@GetMapping("/{id}")
public R<JyjContractualTaskBatchVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
@ -83,7 +83,7 @@ public class JyjContractualTaskBatchController extends BaseController {
/**
* 新增合同批处理记录
*/
@SaCheckPermission("productManagement:JyjcontractualTaskBatch:add")
// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:add")
@Log(title = "合同批处理记录", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
@ -94,7 +94,7 @@ public class JyjContractualTaskBatchController extends BaseController {
/**
* 修改合同批处理记录
*/
@SaCheckPermission("productManagement:JyjcontractualTaskBatch:edit")
// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:edit")
@Log(title = "合同批处理记录", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
@ -107,7 +107,7 @@ public class JyjContractualTaskBatchController extends BaseController {
*
* @param ids 主键串
*/
@SaCheckPermission("productManagement:JyjcontractualTaskBatch:remove")
// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:remove")
@Log(title = "合同批处理记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@ -144,7 +144,7 @@ public class JyjContractualTaskBatchController extends BaseController {
* @param batchName 批次名称
* @param resultType 结果类型
*/
@SaCheckPermission("productManagement:JyjcontractualTaskBatch:export")
// @SaCheckPermission("productManagement:JyjcontractualTaskBatch:export")
@Log(title = "合同批处理结果", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void exportResult(

4
zaojiaManagement/zaojia-productManagement/src/main/resources/mapper/productManagement/ContractualProductInfoMapper.xml
View File

@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND p.unit_price = #{queryParam.unitPrice}
</if>
<if test="queryParam.purchaserName != null and queryParam.purchaserName != ''">
AND i.purchaser_name = LIKE CONCAT('%', #{queryParam.purchaser_name}, '%')
AND i.purchaser_name LIKE CONCAT('%', #{queryParam.purchaserName}, '%')
</if>
AND p.del_flag = '0'
AND dt.result_type = 'reviewSuccess'
@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.cpuModel != null and bo.cpuModel != ''">
AND p.cpu_model LIKE CONCAT('%', #{bo.cpuModel}, '%')
</if>
AND dt.result_type = 'reviewSuccess' AND dt.del_flag = '0'
AND dt.result_type = 'reviewSuccess' AND dt.del_flag = '0' and p.del_flag = '0'
AND
CASE
WHEN #{bo.type} = '终端' THEN p.type IN ('台式计算机', '便携式计算机')

Write Preview
Loading…
Cancel
Save