tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/acceptorder/BoilerAcceptOrderAppController.java

@@ -26,7 +26,7 @@ import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.ge
 
 @Tag(name = "小程序 - 锅炉受理单")
 @RestController
-@RequestMapping("/pressure2/accept-order/boiler")
+@RequestMapping("/pressure2/app/accept-order/boiler")
 @Validated
 @AppAuth
 public class BoilerAcceptOrderAppController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/acceptorder/PipeAcceptOrderAppController.java

@@ -26,7 +26,7 @@ import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.ge
 
 @Tag(name = "小程序 - 管道受理单")
 @RestController
-@RequestMapping("/pressure2/accept-order/pipe")
+@RequestMapping("/pressure2/app/accept-order/pipe")
 @Validated
 @AppAuth
 public class PipeAcceptOrderAppController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/appointmentconfirmorder/BoilerAppointmentConfirmOrderAppController.java

@@ -21,7 +21,7 @@ import static cn.start.tz.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "小程序 - 锅炉约检确认")
 @RestController
-@RequestMapping("/pressure2/appointment-confirm-order/boiler")
+@RequestMapping("/pressure2/app/appointment-confirm-order/boiler")
 @Validated
 @AppAuth
 public class BoilerAppointmentConfirmOrderAppController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/appointmentconfirmorder/PipeAppointmentConfirmOrderAppController.java

@@ -22,7 +22,7 @@ import static cn.start.tz.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "小程序 - 管道约检确认")
 @RestController
-@RequestMapping("/pressure2/appointment-confirm-order/pipe")
+@RequestMapping("/pressure2/app/appointment-confirm-order/pipe")
 @Validated
 @AppAuth
 public class PipeAppointmentConfirmOrderAppController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/BoilerTaskOrderAppApiController.java

@@ -26,7 +26,7 @@ import static cn.start.tz.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "小程序 - 锅炉任务单")
 @RestController
-@RequestMapping("/pressure2/task-order/boiler")
+@RequestMapping("/pressure2/app/task-order/boiler")
 @Validated
 @AppAuth
 public class BoilerTaskOrderAppApiController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/BoilerTaskOrderIssueReportAppController.java

@@ -24,7 +24,7 @@ import static cn.start.tz.framework.security.core.util.SecurityFrameworkUtils.ge
 
 @Tag(name = "小程序 - 锅炉出具报告")
 @RestController
-@RequestMapping("/pressure2/task-order/issue-report/boiler")
+@RequestMapping("/pressure2/app/task-order/issue-report/boiler")
 @Validated
 @AppAuth
 public class BoilerTaskOrderIssueReportAppController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/PipeTaskOrderAppApiController.java

@@ -26,7 +26,7 @@ import static cn.start.tz.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "小程序 - 管道任务单")
 @RestController
-@RequestMapping("/pressure2/task-order/pipe")
+@RequestMapping("/pressure2/app/task-order/pipe")
 @Validated
 @AppAuth
 public class PipeTaskOrderAppApiController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/app/taskorder/PipeTaskOrderIssueReportAppController.java

@@ -22,7 +22,7 @@ import static cn.start.tz.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "小程序 - 管道出具报告")
 @RestController
-@RequestMapping("/pressure2/task-order/issue-report/pipe")
+@RequestMapping("/pressure2/app/task-order/issue-report/pipe")
 @Validated
 @AppAuth
 public class PipeTaskOrderIssueReportAppController {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/framework/appauth/config/AppAuthWebConfiguration.java

@@ -17,12 +17,12 @@ public class AppAuthWebConfiguration implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(appAuthInterceptor)
                 .addPathPatterns(
-                        "/app-api/pressure2/accept-order/**",
-                        "/app-api/pressure2/appointment-confirm-order/**",
-                        "/app-api/pressure2/equip-container/**",
-                        "/app-api/pressure2/task-order/**",
-                        "/app-api/pressure2/task-order-item-report/**",
-                        "/app-api/pressure2/report-template/**"
+                        "/app-api/pressure2/app/accept-order/**",
+                        "/app-api/pressure2/app/appointment-confirm-order/**",
+                        "/app-api/pressure2/app/equip-container/**",
+                        "/app-api/pressure2/app/task-order/**",
+                        "/app-api/pressure2/app/task-order-item-report/**",
+                        "/app-api/pressure2/app/report-template/**"
                 );
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorderitemreport/BoilerAppTaskOrderItemReportServiceImpl.java

@@ -65,14 +65,14 @@ public class BoilerAppTaskOrderItemReportServiceImpl implements BoilerAppTaskOrd
     @Override
     public PageResult<BoilerOrderItemPageRespVO> appInspectionOpinionPage(BoilerTaskOrderPageReqVO pageReqVO) {
         // 不传单位code时根据当前登录人memberId查询
-//        if (StringUtils.isEmpty(pageReqVO.getUnitCode())) {
-//            String userId = AppAuthContextHolder.getUserId();
-//            if (ObjectUtil.isEmpty(userId) || StringUtils.isEmpty(userId)) {
-//                return new PageResult<>();
-//            }
-//            pageReqVO.setMemberId(userId);
-//        }
-        pageReqVO.setRecipientPhone(null);
+        if (StringUtils.isEmpty(pageReqVO.getUnitCode())) {
+            String userId = AppAuthContextHolder.getUserId();
+            if (ObjectUtil.isEmpty(userId) || StringUtils.isEmpty(userId)) {
+                return new PageResult<>();
+            }
+            pageReqVO.setMemberId(userId);
+        }
+//        pageReqVO.setRecipientPhone(null);
         return boilerTaskOrderService.inspectionOpinionPage(pageReqVO);
     }
 

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorderitemreport/PipeAppTaskOrderItemReportServiceImpl.java

@@ -59,14 +59,14 @@ public class PipeAppTaskOrderItemReportServiceImpl implements PipeAppTaskOrderIt
     @Override
     public PageResult<PipeOrderItemPageRespVO> appInspectionOpinionPage(PipeTaskOrderPageReqVO pageReqVO) {
         // 不传单位code时根据当前登录人memberId查询
-//        if (StringUtils.isEmpty(pageReqVO.getUnitCode())) {
-//            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
-//            if (ObjectUtil.isEmpty(loginUser) || StringUtils.isEmpty(loginUser.getId())) {
-//                return new PageResult<>();
-//            }
-//            pageReqVO.setMemberId(loginUser.getId());
-//        }
-        pageReqVO.setRecipientPhone(null);
+        if (StringUtils.isEmpty(pageReqVO.getUnitCode())) {
+            LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+            if (ObjectUtil.isEmpty(loginUser) || StringUtils.isEmpty(loginUser.getId())) {
+                return new PageResult<>();
+            }
+            pageReqVO.setMemberId(loginUser.getId());
+        }
+//        pageReqVO.setRecipientPhone(null);
         return pipeTaskOrderService.inspectionOpinionPage(pageReqVO);
     }