优化

platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -520,4 +520,9 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     private String tempUserId;
     private String roleCode;
 
+    /**
+     * 导出ID
+     */
+    private List<String> repairIds;
+
 }

platform-dao/src/main/resources/mapper/repair/RepairApplicationFormMapper.xml

@@ -159,6 +159,12 @@
             <if test="addCalendar!=null and !addCalendar">
                 and application.calendar_date is null
             </if>
+            <if test="repairIds != null and repairIds.size > 0">
+                AND application.id in
+                <foreach item="item" index="index" collection="repairIds" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="selectById" parameterType="java.lang.Object"

platform-rest/src/main/java/com/platform/rest/config/security/TokenEndpointAspect.java

@@ -1,9 +1,7 @@
 package com.platform.rest.config.security;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.platform.common.constant.AuthConstant;
 import com.platform.common.constant.CommonConstants;
-import com.platform.common.constant.SecurityConstants;
 import com.platform.common.enums.ResultCode;
 import com.platform.common.exception.Auth2Exception;
 import com.platform.common.exception.BusinessException;
@@ -26,7 +24,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.oauth2.common.DefaultOAuth2AccessToken;
@@ -35,10 +32,8 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.stereotype.Component;
 
 import java.security.Principal;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 声明这是一个组件

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

@@ -594,9 +594,6 @@ public class RepairApplicationFormController {
                 String professor = DictCache.getLabelByValue("REPAIR_APPLICATION_PROFESSOR",Integer.parseInt(a));
                 sb.append(professor+",");
             }
-//            vo.setRepairProfessor(DictCache.getLabelByValue("REPAIR_APPLICATION_PROFESSOR",vo.getRepairProfessor()));
-//            String str =DictCache.getLabelByValue("SYS_DEPT_NATURE", "JITUAN");
-//            System.out.println(str);
             vo.setRepairProfessor(sb.toString().substring(0,sb.toString().length()-1));
 
         }