zhoutg 5 лет назад
Родитель
Сommit
e36862f80e

+ 0 - 8
knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -1,20 +1,12 @@
 package com.diagbot.config.security;
 
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.Token;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.util.HttpUtils;
-import com.diagbot.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.ConfigAttribute;
-import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.InsufficientAuthenticationException;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.stereotype.Service;
 

+ 2 - 2
knowledgeman-service/src/main/resources/mapper/LisMappingMapper.xml

@@ -128,7 +128,7 @@
 
      <select id="getUniqueName" resultType="com.diagbot.vo.LisMappingSearch">
         select * from (
-            SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, lib2.name mx, b3.lib_name unique_name
+            SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, IFNULL(lib2.name,'') mx, b3.lib_name unique_name
             FROM `kl_lis_mapping` a
             LEFT JOIN kl_concept b1 on a.meal_id = b1.id and b1.is_deleted = 'N'
             LEFT JOIN kl_library_info lib1 on b1.id = lib1.concept_id and lib1.is_deleted = 'N'
@@ -145,7 +145,7 @@
 
     <select id="loadLisMapping" resultType="java.lang.String">
         select concat(tc, '__',mx, '__', unique_name) from (
-        SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, lib2.name mx, b3.lib_name unique_name
+        SELECT b1.lib_name meal_name, lib1.name tc, IFNULL(b2.lib_name,'') item_name, IFNULL(lib2.name,'') mx, b3.lib_name unique_name
         FROM `kl_lis_mapping` a
         LEFT JOIN kl_concept b1 on a.meal_id = b1.id and b1.is_deleted = 'N'
         LEFT JOIN kl_library_info lib1 on lib1.concept_id = b1.id and lib1.is_deleted = 'N'