diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/GoodsController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/GoodsController.java index 5b5e645..f6f4d2d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/GoodsController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/GoodsController.java @@ -3,7 +3,10 @@ package org.jeecg.modules.demo.erp.controller; import java.util.Arrays; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.PermissionData; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.demo.erp.entity.Goods; import org.jeecg.modules.demo.erp.service.IGoodsService; @@ -48,6 +51,7 @@ public class GoodsController extends JeecgController { //@AutoLog(value = "产品信息-分页列表查询") @ApiOperation(value="产品信息-分页列表查询", notes="产品信息-分页列表查询") @GetMapping(value = "/list") + @PermissionData(pageComponent = "erp/GoodsList") public Result> queryPageList(Goods goods, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Goods.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Goods.java index 7a91b8f..d3f9158 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Goods.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/entity/Goods.java @@ -66,6 +66,9 @@ public class Goods implements Serializable { @Dict(dicCode = "ifSale") @ApiModelProperty(value = "是否销售,0:否,1:是 默认") private java.lang.Integer ifSale; + /**所属项目*/ + @ApiModelProperty(value = "所属项目") + private java.lang.String orgCode; /**图片地址*/ @ApiModelProperty(value = "图片地址") private java.lang.String url; diff --git a/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot-module-system/src/main/resources/application-prod.yml index cc50793..286c9b7 100644 --- a/jeecg-boot-module-system/src/main/resources/application-prod.yml +++ b/jeecg-boot-module-system/src/main/resources/application-prod.yml @@ -136,8 +136,8 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://47.100.35.222:3306/nherp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #url: jdbc:mysql://localhost:3306/nhdb?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + #url: jdbc:mysql://47.100.35.222:3306/nherp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.10.15:3306/nherp?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: nhdev2022.+ driver-class-name: com.mysql.cj.jdbc.Driver