维修完善

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -257,7 +257,7 @@ user.real_name as saveUserName
         <if test="useProject != null">
             and sb.use_project = #{useProject}
         </if>
-        <if test="typeId != null">
+        <if test="typeId != null and typeId != ''">
             and sb.type_id = #{typeId}
         </if>
         <if test="parentId != null">

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -206,7 +206,7 @@ public class RepairApplicationFormController {
      */
     @SysLog("提交审核维修单")
     @PutMapping("/examine/{id}")
-    @PreAuthorize("@pms.hasPermission('repair-application-forms-finish')")
+    @PreAuthorize("@pms.hasPermission('repair-application-forms-examine')")
     public R examineApply(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
         repairFormDTO.setId(id);
         RepairStrategyFactory.getStrategy().submitRepair(repairFormDTO);
@@ -235,7 +235,7 @@ public class RepairApplicationFormController {
      */
     @SysLog("派工维修单")
     @PutMapping("/personal/stop/{id}")
-    //@PreAuthorize("@pms.hasPermission('repair-application-forms-dispatch')")
+    @PreAuthorize("@pms.hasPermission('repair-application-forms-transfer-apply')")
     public R personalStop(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody RepairApplicationFormDTO repairFormDTO) {
         repairFormDTO.setId(id);
         RepairStrategyFactory.getStrategy().stopRepairByPerson(repairFormDTO);
@@ -250,7 +250,7 @@ public class RepairApplicationFormController {
      */
     @SysLog("接收维修单")
     @PutMapping("/deal/{id}")
-    @PreAuthorize("@pms.hasPermission('repair-application-forms-deal')")
+    @PreAuthorize("@pms.hasPermission('repair-application-forms-dispatch')")
     public R repairFormDeal(@PathVariable("id") String id) {
         RepairApplicationFormDTO repairApplicationFormDTO = new RepairApplicationFormDTO();
         repairApplicationFormDTO.setId(id);