优化

platform-dao/src/main/java/com/platform/dao/vo/query/sbUnused/SbUnusedVO.java

@@ -23,6 +23,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedVO extends BaseVO implements Serializable{
+    private String verifyUserName;
     private LocalDateTime updateTime;
     private String applyName;
     private String advice;//意见

platform-dao/src/main/resources/mapper/sbUnused/SbUnusedMapper.xml

@@ -64,8 +64,9 @@
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnused.SbUnusedDTO" resultType="com.platform.dao.vo.query.sbUnused.SbUnusedVO">
-        select unused.*
-                                                                                                                                                                                                    from t_sb_unused as unused
+        select unused.*,user.username as applyName,user2.username as verifyUserName
+        from t_sb_unused as unused left join t_sys_user user on user.user_id = unused.apply_user_id
+        left join t_sys_user user2 on user2.user_id = unused.verity_user_id
                                                                                                                                                                                                     <where>
             <include refid="List_Condition" />
         </where>

platform-rest/src/main/java/com/platform/rest/controller/sbUnused/SbUnusedController.java

@@ -64,7 +64,7 @@ public class SbUnusedController {
 
   @SysLog("闲置设备审核")
   @PostMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('sbUnused-unused-add')")
+//  @PreAuthorize("@pms.hasPermission('sbUnused-unused-verifty')")
   public R unusedVerify(@PathVariable String id,@RequestBody SbUnusedDTO dto) {
     sbUnusedService.unusedVerify(id,dto);
     return new R<>();
@@ -78,7 +78,7 @@ public class SbUnusedController {
    */
   @SysLog("修改设备闲置表")
   @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('sbUnused-unused-edit')")
+//  @PreAuthorize("@pms.hasPermission('sbUnused-unused-edit')")
   public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SbUnusedDTO sbUnusedDTO) {
       sbUnusedService.modModelByDTO(sbUnusedDTO);
       return new R<>();
@@ -94,7 +94,7 @@ public class SbUnusedController {
    */
   @SysLog("删除设备闲置表")
   @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('sbUnused-unused-del')")
+//  @PreAuthorize("@pms.hasPermission('sbUnused-unused-del')")
   public R removeById(@PathVariable String id){
     sbUnusedService.deleteByPrimaryKey(id);
     return new R<>();
@@ -108,7 +108,7 @@ public class SbUnusedController {
      */
     @SysLog("批量删除设备闲置表")
     @DeleteMapping("")
-    @PreAuthorize("@pms.hasPermission('sbUnused-unused-del')")
+//    @PreAuthorize("@pms.hasPermission('sbUnused-unused-del')")
     public R removeIds(@RequestBody List<String> ids){
         sbUnusedService.batchDelete(ids);
         return new R<>();
@@ -146,7 +146,7 @@ public class SbUnusedController {
      */
   @GetMapping("/export")
   @SysLog("设备闲置表导出")
-  @PreAuthorize("@pms.hasPermission('sbUnused-unused-export')")
+//  @PreAuthorize("@pms.hasPermission('sbUnused-unused-export')")
   public void export(HttpServletResponse response, SbUnusedDTO sbUnusedDTO) {
     List<SbUnused> list = sbUnusedService.getModelListByDTO(sbUnusedDTO);
     ExcelUtil.exportResponseDict(response, ExportSbUnusedVO.class, BeanConverterUtil.copyListProperties(list, ExportSbUnusedVO.class), "设备闲置表");