生成文件对应部门不准问题修复

SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java

@@ -26,12 +26,14 @@ import jnpf.paymentdoc.service.PaymentdocItem0Service;
 import jnpf.paymentdoc.service.PaymentdocItem1Service;
 import jnpf.paymentdoc.service.PaymentdocItem2Service;
 import jnpf.paymentdoc.service.PaymentdocService;
+import jnpf.permission.constant.PermissionConst;
 import jnpf.permission.entity.UserEntity;
 import jnpf.permission.mapper.UserMapper;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.permission.service.AuthorizeService;
 import jnpf.permission.service.OrganizeService;
-import jnpf.permission.util.PermissionUtil;
+import jnpf.permission.service.UserRelationService;
+import jnpf.permission.service.UserService;
 import jnpf.supplier.entity.SupplierEntity;
 import jnpf.supplier.service.SupplierService;
 import jnpf.util.*;
@@ -387,7 +389,10 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
     @Resource
     private OrganizeService organizeService;
 
-
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserRelationService userRelationService;
 
     @Override
     public void getPaymentDocPdf(String id,String token) throws IOException {
@@ -414,8 +419,13 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
             paymentdocMessage.setNowTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
             // 获取组织
             if(StringUtil.isNotNull(userEntity.getOrganizeId())){
-                paymentdocMessage.setFullName(PermissionUtil.getLinkInfoByOrgId(userEntity.getOrganizeId(), organizeService, false));
+//                paymentdocMessage.setFullName(PermissionUtil.getLinkInfoByOrgId(userEntity.getOrganizeId(), organizeService, false));
+                paymentdocMessage.setFullName(userRelationService.getObjectVoList(PermissionConst.ORGANIZE,userEntity).get(0).getFullName());
             }
+
+            log.warn("这是组织"+paymentdocMessage.getFullName());
+
+
         }
         String substring = null;
         String substring1 = null;

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java

@@ -32,10 +32,13 @@ import jnpf.materialvo.mapper.MaterialMapper;
 import jnpf.mobilePort.utils.ExportPdf;
 import jnpf.mobilePort.utils.FileCopy;
 import jnpf.mobilePort.utils.MultipartFileDto;
+import jnpf.permission.constant.PermissionConst;
+import jnpf.permission.entity.UserEntity;
+import jnpf.permission.mapper.UserMapper;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.permission.service.AuthorizeService;
 import jnpf.permission.service.OrganizeService;
-import jnpf.permission.util.PermissionUtil;
+import jnpf.permission.service.UserRelationService;
 import jnpf.poundlist.entity.PoundlistEntity;
 import jnpf.poundlist.mapper.PoundlistMapper;
 import jnpf.poundlist.service.PoundlistService;
@@ -610,6 +613,10 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 
     @Resource
     private OrganizeService organizeService;
+    @Resource
+    private UserRelationService userRelationService;
+    @Resource
+    private UserMapper userMapper;
 
     @Override
     public void getPdfInfo(PurchaseorderitemEntity purchaseorderitemEntity, HttpServletResponse response,String token) throws Exception {
@@ -620,10 +627,14 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
 //        String id1 = userProvider.get().getId();
         String fullName=null;
         if (id1!=null){
-
+            QueryWrapper<UserEntity> userEntityQueryWrapper = new QueryWrapper<>();
+            userEntityQueryWrapper.lambda().eq(UserEntity::getId,id1);
+            List<UserEntity> userEntities = userMapper.selectList(userEntityQueryWrapper);
+            UserEntity userEntity = userEntities.get(0);
             // 获取组织
             if(StringUtil.isNotNull(userInfo.getOrganizeId())){
-             fullName=   PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService,false);
+//             fullName=   PermissionUtil.getLinkInfoByOrgId(userInfo.getOrganizeId(), organizeService,false);
+             fullName=   userRelationService.getObjectVoList(PermissionConst.ORGANIZE,userEntity).get(0).getFullName();
             }
         }
         System.out.println("这是账号信息"+fullName);

SC-boot/linkage-system/src/main/java/jnpf/permission/service/UserRelationService.java

@@ -1,9 +1,9 @@
 package jnpf.permission.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.permission.entity.UserEntity;
 import jnpf.permission.entity.UserRelationEntity;
 import jnpf.permission.model.permission.PermissionModel;
-import jnpf.permission.model.permission.PermissionVoBase;
 import jnpf.permission.model.userrelation.UserRelationForm;
 
 import java.util.List;
@@ -125,6 +125,7 @@ public interface UserRelationService extends IService<UserRelationEntity> {
      * @param objectType 归属类型
      */
     List<PermissionModel> getObjectVoList(String objectType);
+    List<PermissionModel> getObjectVoList(String objectType, UserEntity userEntity);
 
     /**
      * 判断岗位/角色与用户是否存在关联关系

SC-boot/linkage-system/src/main/java/jnpf/permission/service/impl/UserRelationServiceImpl.java

@@ -1,30 +1,27 @@
 package jnpf.permission.service.impl;
 
-import cn.hutool.core.util.ArrayUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import jnpf.base.UserInfo;
 import jnpf.permission.constant.PermissionConst;
-import jnpf.permission.entity.*;
+import jnpf.permission.entity.PermissionEntityBase;
+import jnpf.permission.entity.PositionEntity;
+import jnpf.permission.entity.UserEntity;
+import jnpf.permission.entity.UserRelationEntity;
 import jnpf.permission.mapper.UserRelationMapper;
 import jnpf.permission.model.permission.PermissionModel;
-import jnpf.permission.model.permission.PermissionVoBase;
 import jnpf.permission.model.userrelation.UserRelationForm;
 import jnpf.permission.service.*;
 import jnpf.permission.util.PermissionUtil;
-import jnpf.util.JsonUtil;
 import jnpf.util.RandomUtil;
-import jnpf.util.StringUtil;
 import jnpf.util.UserProvider;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -259,6 +256,32 @@ public class UserRelationServiceImpl extends ServiceImpl<UserRelationMapper, Use
         }
     }
 
+    @Override
+    public List<PermissionModel> getObjectVoList(String objectType, UserEntity userEntity) {
+        String userId = userEntity.getId();
+        String majorOrgId = userEntity.getOrganizeId();
+
+        // 组装对应组织/岗位/角色对象
+        switch (objectType) {
+            case PermissionConst.ORGANIZE:
+                // 使用in查询减少数据库查询次数
+                List<String> ids = new ArrayList<>();
+                this.getListByObjectType(userId, objectType).forEach(r -> ids.add(r.getObjectId()));
+                List<PermissionModel> permissionModels = setModel(organizeService.getOrgEntityList(ids, false), majorOrgId);
+                permissionModels.forEach(p->p.setFullName(PermissionUtil.getLinkInfoByOrgId(p.getId(), organizeService, false)));
+                return permissionModels;
+            case PermissionConst.POSITION:
+                // 岗位遵循一对多关系
+                List<PositionEntity> positionList = positionService.getListByUserId(userId);
+                if (positionList.size() > 0) {
+                    return setModel(positionList.stream().filter(p -> p.getOrganizeId().equals(majorOrgId))
+                            .collect(Collectors.toList()), userEntity.getPositionId());
+                }
+            default:
+                return null;
+        }
+    }
+
     /**
      * 设置返回模型
      *