Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.32
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.33
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.31
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.33
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.32</version>
+    <version>0.0.33</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRuleController.java

@@ -55,7 +55,8 @@ public class PointRuleController {
 	 */
 	@PostMapping(value = "list")
 	@RequirePermission( requirePermission = RequirePermissionEnum.MORE_POINT_RULE_LIST)
-	public Result<List<PointRuleResultDTO>> list( @RequestBody PointRuleListFormDTO formDTO) {
+	public Result<List<PointRuleResultDTO>> list(@LoginUser TokenDto tokenDTO,  @RequestBody PointRuleListFormDTO formDTO) {
+		formDTO.setCustomerId(tokenDTO.getCustomerId());
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<PointRuleResultDTO>>().ok(pointRuleService.list(formDTO));
 	}