Merge branch 'origin/fix/archivePower' into develop

src/com/engine/salary/biz/SIArchivesBiz.java

@@ -123,6 +123,8 @@ public class SIArchivesBiz {
 
         SISchemeBiz siSchemeBiz = new SISchemeBiz();
         List<InsuranceSchemePO> list = siSchemeBiz.listAll();
+        // 过滤可见性范围
+        list = filterList(list);
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionOption> paymentOptions = paymentOrganizationOptions();
@@ -191,6 +193,32 @@ public class SIArchivesBiz {
         return data;
     }
 
+    /***
+     * @description 过滤没有权限访问的
+     * @return List<InsuranceSchemePO>
+     * @author Harryxzy
+     * @date 2022/9/19 18:32
+     */
+    List<InsuranceSchemePO> filterList(List<InsuranceSchemePO> list){
+        List<String> IDs = taxAgentPOS.stream().map(i -> String.valueOf(i.getId())).collect(Collectors.toList());
+        List<InsuranceSchemePO> result = list.stream().filter(item -> {
+            boolean flag = true;
+            if (item.getSharedType()!= null && item.getSharedType().equals("1")) {
+                flag = false;
+                String taxAgentIds = item.getTaxAgentIds();
+                String splitFlag = ",";
+                String[] split = taxAgentIds.split(splitFlag);
+                for (int i = 0; i < split.length; i++) {
+                    if (IDs.contains(split[i])) {
+                        flag = true;
+                    }
+                }
+            }
+            return flag;
+        }).collect(Collectors.toList());
+        return result;
+    }
+
     /**
      * 获取详细表单
      *

src/com/engine/salary/biz/SISchemeBiz.java

@@ -208,12 +208,11 @@ public class SISchemeBiz {
      *
      * @return
      */
-    public List<InsuranceSchemePO> listAll() {
+    public List<InsuranceSchemePO> listAll(){
         SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
         try {
             InsuranceSchemeMapper insuranceSchemeMapper = sqlSession.getMapper(InsuranceSchemeMapper.class);
             List<InsuranceSchemePO> insuranceSchemePOList = insuranceSchemeMapper.listAll();
-
             return insuranceSchemePOList;
         } finally {
             sqlSession.close();

src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java

@@ -59,6 +59,7 @@ public class InsuranceSchemePO {
      */
     private String taxAgentIds;
 
+
     /**
      * 是否启用  0-停用 1-启用
      */

src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml

@@ -174,7 +174,8 @@
         </if>
         order by id desc
     </select>
-    
+
+
     <update id="deleteByIds">
         UPDATE hrsa_social_security_scheme
         SET delete_type=1