Merge remote-tracking branch 'origin/release' into release

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SsoLoginServiceImpl.java

@@ -264,29 +264,60 @@ public class SsoLoginServiceImpl implements SsoLoginService {
         return roleIds;
     }
 
+//    public List<SysUserOrgEntity> toUserOrg(SsoUser user) {
+//        SysUserOrgEntity userOrg;
+//        List<SysUserOrgEntity> listUserOrg = new ArrayList<>();
+//        List<Long> dataPerm = user.getDataPerm();
+//        List<com.xxl.sso.core.entity.SysDeptEntity> taxplayercodeDeptList = user.getTaxplayercodeDeptList();
+//        if (dataPerm != null && dataPerm.size() > 0) {
+//            for (Long deptId : dataPerm) {
+//                if (dataPerm.size() > 0) {
+//                    for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) {
+//                        log.debug("deptId : " + deptId + "   sysDetp: " + sysDeptEntity.getDeptId());
+//                        if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) {
+//                            userOrg = new SysUserOrgEntity();
+//                            userOrg.setCompany(AdminConfig.company);
+//                            userOrg.setDeptId(sysDeptEntity.getDeptId());
+//                            userOrg.setTaxname(sysDeptEntity.getName());
+//                            userOrg.setTaxno(sysDeptEntity.getTaxpayerCode());
+//                            listUserOrg.add(userOrg);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        log.debug("listUserOrg : " + listUserOrg.size() + "   listUserOrgJson: " + JSON.toJSONString(listUserOrg));
+//        return listUserOrg;
+//    }
+
     public List<SysUserOrgEntity> toUserOrg(SsoUser user) {
         SysUserOrgEntity userOrg;
+        Map<Long, com.xxl.sso.core.entity.SysDeptEntity> detpCollect = null;
         List<SysUserOrgEntity> listUserOrg = new ArrayList<>();
         List<Long> dataPerm = user.getDataPerm();
         List<com.xxl.sso.core.entity.SysDeptEntity> taxplayercodeDeptList = user.getTaxplayercodeDeptList();
+        if(taxplayercodeDeptList != null && taxplayercodeDeptList.size() > 0){
+            detpCollect = taxplayercodeDeptList.stream().collect(Collectors.toMap(com.xxl.sso.core.entity.SysDeptEntity::getDeptId, tri -> tri));
+        }
+        if(detpCollect == null){
+            return listUserOrg;
+        }
         if (dataPerm != null && dataPerm.size() > 0) {
+
             for (Long deptId : dataPerm) {
-                if (dataPerm.size() > 0) {
-                    for (com.xxl.sso.core.entity.SysDeptEntity sysDeptEntity : taxplayercodeDeptList) {
-                        log.debug("deptId : " + deptId + "   sysDetp: " + sysDeptEntity.getDeptId());
-                        if (deptId.longValue() == sysDeptEntity.getDeptId().longValue()) {
+                com.xxl.sso.core.entity.SysDeptEntity deptEntity = detpCollect.get(deptId);
+                if(deptEntity != null){
                     userOrg = new SysUserOrgEntity();
                     userOrg.setCompany(AdminConfig.company);
-                            userOrg.setDeptId(sysDeptEntity.getDeptId());
-                            userOrg.setTaxname(sysDeptEntity.getName());
-                            userOrg.setTaxno(sysDeptEntity.getTaxpayerCode());
+                    userOrg.setDeptId(deptEntity.getDeptId());
+                    userOrg.setTaxname(deptEntity.getName());
+                    userOrg.setTaxno(deptEntity.getTaxpayerCode());
                     listUserOrg.add(userOrg);
                 }
             }
+
         }
-            }
-        }
-        log.debug("listUserOrg : " + listUserOrg.size() + "   listUserOrgJson: " + JSON.toJSONString(listUserOrg));
+        log.info("listUserOrg : " + listUserOrg.size() + "   listUserOrgJson: " + JSON.toJSONString(listUserOrg));
         return listUserOrg;
     }
 

dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpbrzServiceImpl.java

@@ -57,6 +57,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
     private TabulateRedisService tabulateRedisService;
     @Resource
     private DictdetaServcice dictdetaServcice;
+    BaseFpbrzDao baseFpbrzDao;
 
     @Override
     public String selectByFpbrz(Map<String, Object> pramsMap, int curr, int size) {
@@ -65,6 +66,7 @@ public class BaseFpbrzServiceImpl extends MpBaseServiceImpl<BaseFpbrzDao, BaseTD
         String menuId = (String)pramsMap.get("menuId");
         JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId);
 
+
         DynamicContextHolder.push(pramsMap.get("dbName") + DbConstant.BUSINESS_READ);
 
         List<String> taxnoList = (List<String>)pramsMap.get("gfsh");

pom.xml

@@ -176,9 +176,9 @@
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
             <!-- 默认激活 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+<!--            <activation>-->
+<!--                <activeByDefault>true</activeByDefault>-->
+<!--            </activation>-->
         </profile>
         <!-- 测试环境 -->
         <profile>
@@ -220,9 +220,9 @@
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
             <!-- 默认激活 -->
-<!--            <activation>-->
-<!--                <activeByDefault>true</activeByDefault>-->
-<!--            </activation>-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
     </profiles>