feature 代码提交

js-security/security-common/pom.xml

@@ -37,12 +37,6 @@
             <version>4.4.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.rongwei</groupId>
-            <artifactId>training-common</artifactId>
-            <version>1.1-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
 </project>

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckTemplateServiceImpl.java

@@ -25,6 +25,7 @@ import com.rongwei.sfcommon.utils.MlConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.*;

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/QueryFilteringController.java

@@ -103,10 +103,21 @@ public class QueryFilteringController {
         }).flatMap(Arrays::stream).distinct().collect(Collectors.toList());
         // 过滤的数据ID
         String curentUserisolationId = isolationId.stream().filter(userOrgIds::contains).findFirst().orElse(null);
-        SEARCH_COLUMN_VO.setValue(curentUserisolationId);
-        COLUMN_QUERY_TYPE.setColumns(Arrays.asList(SEARCH_COLUMN_VO));
+//        SEARCH_COLUMN_VO.setValue(curentUserisolationId);
+        SearchColumnVo searchColumnVo = new SearchColumnVo() {{
+            setField("TENANTID");
+            setFieldType("string");
+            setSymbol("like");
+            setValue(curentUserisolationId);
+        }};
+        ColumnQueryType columnQueryType = new ColumnQueryType() {{
+            setLastTyepRelation(AND);
+            setColumnInnerRelation(AND);
+            setColumns(Arrays.asList(searchColumnVo));
+        }};
+//        COLUMN_QUERY_TYPE.setColumns(Arrays.asList(SEARCH_COLUMN_VO));
         List<ColumnQueryType> columnQueryTypes = criteriaQuery.getColumnQueryTypes();
-        columnQueryTypes.add(COLUMN_QUERY_TYPE);
+        columnQueryTypes.add(columnQueryType);
         criteriaQuery.setColumnQueryTypes(columnQueryTypes);
         return R.ok(criteriaQuery);
     }