11/1

src/main/java/cn/cslg/pas/common/dto/business/ProductCategoryDTO.java

@@ -32,5 +32,5 @@ public class ProductCategoryDTO {
     @Schema(description = "描述")
     private String description;
     @Schema(description = "可见类型的人员id")
-    private List<Integer> showPersonIds;
+    private List<String> showPersonIds;
 }

src/main/java/cn/cslg/pas/common/dto/business/UpdateProductCategoryDTO.java

@@ -29,7 +29,7 @@ public class UpdateProductCategoryDTO {
     @Schema(description = "描述")
     private String description;
     @Schema(description = "可见类型的人员id")
-    private List<Integer> showPersonIds;
+    private List<String> showPersonIds;
     @Schema(description = "文件guid")
     private List<String> guids;
 }

src/main/java/cn/cslg/pas/common/vo/business/ProductCategoryVO.java

@@ -26,13 +26,13 @@ public class ProductCategoryVO {
     @Schema(description = "可见类型（0所有人可见、1本人可见、2仅选定人可见、3选定人不可见）")
     private Integer showType;
     @Schema(description = "可见人员ids")
-    private List<Integer> showPersonIds;
+    private List<String> showPersonIds;
     @Schema(description = "描述")
     private String description;
     @Schema(description = "创建人")
     private String createName;
     @Schema(description = "创建人id")
-    private Integer createId;
+    private String createId;
     @Schema(description = "创建时间")
     private Date createTime;
     @Schema(description = "文件信息")

src/main/java/cn/cslg/pas/common/vo/business/ProductVO.java

@@ -28,10 +28,12 @@ public class ProductVO {
     private Integer categoryId;
     @Schema(description = "可见类型(0所有人可见，1本人可见，2仅选定人可见，3选定人不可见)")
     private Integer showType;
+    @Schema(description = "可见人员ids")
+    private List<String> showPersonIds;
     @Schema(description = "描述")
     private String description;
     @Schema(description = "创建人id")
-    private Integer createId;
+    private String createId;
     @Schema(description = "创建人")
     private String createName;
     @Schema(description = "创建时间")

src/main/java/cn/cslg/pas/common/vo/business/TreeNodeVO.java

@@ -36,7 +36,7 @@ public class TreeNodeVO {
     @Schema(description = "层级")
     private Integer level;
     @Schema(description = "创建人id")
-    private Integer createId;
+    private String createId;
     @Schema(description = "创建人")
     private String createName;
     @Schema(description = "创建时间")

src/main/java/cn/cslg/pas/controller/ProductCategoryController.java

@@ -2,10 +2,13 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.dto.business.ProductCategoryDTO;
+import cn.cslg.pas.common.dto.business.UpdateProductCategoryDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
 
+import cn.cslg.pas.exception.ConditionException;
+import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
@@ -53,6 +56,10 @@ public class ProductCategoryController {
             } catch (Exception e){
                 if(e instanceof XiaoShiException) {
                     return Response.error(e.getMessage());
+                } else if (e instanceof UnLoginException) {
+                    return Response.unLogin(e.getMessage());
+                } else if (e instanceof ConditionException) {
+                    return Response.conditionError(e.getMessage());
                 }
             }
             return Response.success(id);
@@ -65,9 +72,9 @@ public class ProductCategoryController {
     @PostMapping("/updateProductCategory")
     public Response updateProductCategory(String productCategory, List<MultipartFile> files) throws Exception {
         if (productCategory != null) {
-            ProductCategoryDTO productCategoryDTO = JSONObject.parseObject(productCategory, ProductCategoryDTO.class);
+            UpdateProductCategoryDTO updateProductCategoryDTO = JSONObject.parseObject(productCategory, UpdateProductCategoryDTO.class);
             Business business = businessFactory.getClass("productCategoryService");
-            business.updateMessage(productCategoryDTO,files);
+            business.updateMessage(updateProductCategoryDTO,files);
             return Response.success(1);
         } else {
             return Response.error("网络异常");

src/main/java/cn/cslg/pas/domain/business/AssoProductCategoryFile.java

@@ -16,11 +16,6 @@ import org.joda.time.DateTime;
 /* 数据库中的表对应的类
  */
 public class AssoProductCategoryFile extends BaseEntity<AssoProductCategoryFile> {
-    /**
-     * 主键id
-     */
-    @TableField(value = "id")
-    private Integer id;
 
     /**
      * 产品类别id
@@ -38,7 +33,7 @@ public class AssoProductCategoryFile extends BaseEntity<AssoProductCategoryFile>
      * 创建人
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
 
     /**
      * 创建时间

src/main/java/cn/cslg/pas/domain/business/AssoProductCategoryPerson.java

@@ -25,7 +25,7 @@ public class AssoProductCategoryPerson extends BaseEntity<AssoProductCategoryPer
      * 人员id
      */
     @TableField(value = "person_id")
-    private Integer personId;
+    private String personId;
 
     /**
      * 人员角色
@@ -38,7 +38,7 @@ public class AssoProductCategoryPerson extends BaseEntity<AssoProductCategoryPer
      * 创建人id
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
 
     /**
      * 创建时间

src/main/java/cn/cslg/pas/domain/business/AssoProductFile.java

@@ -19,12 +19,6 @@ import org.joda.time.DateTime;
  */
 public class AssoProductFile extends BaseEntity<AssoProductFile> {
     /**
-     * 主键
-     */
-    @TableField(value = "id")
-    private Integer id;
-
-    /**
      * 产品id
      */
     @TableField(value = "product_id")
@@ -40,7 +34,7 @@ public class AssoProductFile extends BaseEntity<AssoProductFile> {
      * 创建人
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
 
     /**
      * 创建时间

src/main/java/cn/cslg/pas/domain/business/AssoProductPerson.java

@@ -0,0 +1,48 @@
+package cn.cslg.pas.domain.business;
+
+import cn.cslg.pas.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.joda.time.DateTime;
+
+/**
+ * 产品与可见人员关联表
+ * @Author xiexiang
+ * @Date 2023/11/1
+ */
+@Data
+@TableName("asso_product_person")
+public class AssoProductPerson extends BaseEntity<AssoProductPerson> {
+
+    /**
+     * 产品id
+     */
+    @TableField(value = "product_id")
+    private Integer productId;
+
+    /**
+     * 人员id
+     */
+    @TableField(value = "person_id")
+    private String personId;
+
+    /**
+     * 人员角色
+     * 0管理员1查看人员2禁止查看人员
+     */
+    @TableField(value = "role")
+    private Integer role;
+
+    /**
+     * 创建人id
+     */
+    @TableField(value = "create_id")
+    private String createId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private DateTime createTime;
+}

src/main/java/cn/cslg/pas/domain/business/AssoTreeNodeFile.java

@@ -16,11 +16,6 @@ import org.joda.time.DateTime;
 /* 数据库中的表对应的类
  */
 public class AssoTreeNodeFile extends BaseEntity<AssoProductFile> {
-    /**
-     * 主键
-     */
-    @TableField(value = "id")
-    private Integer id;
 
     /**
      * 树节点id
@@ -38,7 +33,7 @@ public class AssoTreeNodeFile extends BaseEntity<AssoProductFile> {
      * 创建人
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
 
     /**
      * 创建时间

src/main/java/cn/cslg/pas/domain/business/Product.java

@@ -14,11 +14,6 @@ import lombok.Data;
 @Data
 @TableName("product")
 public class Product extends BaseEntity<Product> {
-    /**
-     * 主键
-     */
-    @TableField(value = "id")
-    private Integer id;
 
     /**
      * 产品名称
@@ -60,7 +55,7 @@ public class Product extends BaseEntity<Product> {
      * 创建人
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
 
     /**
      * 创建时间

src/main/java/cn/cslg/pas/domain/business/ProductCategory.java

@@ -46,7 +46,7 @@ public class ProductCategory extends BaseEntity<ProductCategory> {
      * 创建人
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
     /**
      * 创建时间
      */

src/main/java/cn/cslg/pas/domain/business/TreeNode.java

@@ -59,7 +59,7 @@ public class TreeNode extends BaseEntity<TreeNode> {
      * 创建人
      */
     @TableField(value = "create_id")
-    private Integer createId;
+    private String createId;
 
     /**
      * 创建时间

src/main/java/cn/cslg/pas/mapper/AssoProductCategoryPersonMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 /**
+ * 产品类别与人员关联Mapper层
  * @Author xiexiang
  * @Date 2023/10/31
  */

src/main/java/cn/cslg/pas/mapper/AssoProductPersonMapper.java

@@ -0,0 +1,14 @@
+package cn.cslg.pas.mapper;
+
+import cn.cslg.pas.domain.business.AssoProductPerson;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 产品与人员关联Mapper层
+ * @Author xiexiang
+ * @Date 2023/11/1
+ */
+@Repository
+public interface AssoProductPersonMapper extends BaseMapper<AssoProductPerson> {
+}

src/main/java/cn/cslg/pas/mapper/ProductMapper.java

@@ -15,4 +15,5 @@ import java.util.List;
 @Repository
 public interface ProductMapper extends BaseMapper<Product> {
     List<ProductVO> getProduct(String sql1,String sql2,String sql3);
+    Long getProductCount(String sql);
 }

src/main/java/cn/cslg/pas/service/business/AssoProductPersonService.java

@@ -0,0 +1,15 @@
+package cn.cslg.pas.service.business;
+
+import cn.cslg.pas.domain.business.AssoProductPerson;
+import cn.cslg.pas.mapper.AssoProductPersonMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 产品与可见人员关联表Service层
+ * @Author xiexiang
+ * @Date 2023/11/1
+ */
+@Service
+public class AssoProductPersonService extends ServiceImpl<AssoProductPersonMapper, AssoProductPerson> {
+}

src/main/java/cn/cslg/pas/service/business/ProductCategoryService.java

@@ -66,19 +66,29 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
     @Autowired
     private PermissionService permissionService;
 
+    /**
+     * 查询产品类别
+     * @param queryRequest
+     * @return
+     * @throws Exception
+     */
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         List<String> sqls = formatQueryService.reSqls(queryRequest,"productCategory");
         //根据sql查询产品类别信息
         List<ProductCategoryVO> productCategoryVOS = productCategoryMapper.getProductCategory(sqls.get(0),sqls.get(1),sqls.get(2));
+        //遍历查询出来的产品类别
         productCategoryVOS.forEach(item -> {
+            //根据showType到产品类别与可见人员关联表中查询可见人员
             Integer showType = item.getShowType();
-            LambdaQueryWrapper<AssoProductCategoryPerson> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(AssoProductCategoryPerson::getProductCategoryId, item.getId());
-            queryWrapper.eq(AssoProductCategoryPerson::getRole,showType);
-            List<AssoProductCategoryPerson> assoProductCategoryPeople = assoProductCategoryPersonService.list(queryWrapper);
-            List<Integer> showPersonIds = assoProductCategoryPeople.stream().map(AssoProductCategoryPerson::getPersonId).collect(Collectors.toList());
-            item.setShowPersonIds(showPersonIds);
+            if(showType == 2 && showType == 3){
+                LambdaQueryWrapper<AssoProductCategoryPerson> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(AssoProductCategoryPerson::getProductCategoryId, item.getId());
+                queryWrapper.eq(AssoProductCategoryPerson::getRole,showType);
+                List<AssoProductCategoryPerson> assoProductCategoryPeople = assoProductCategoryPersonService.list(queryWrapper);
+                List<String> showPersonIds = assoProductCategoryPeople.stream().map(AssoProductCategoryPerson::getPersonId).collect(Collectors.toList());
+                item.setShowPersonIds(showPersonIds);
+            }
         });
         //查询总数
         Long total = productCategoryMapper.getProductCategoryCount(sqls.get(0));
@@ -122,21 +132,21 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         //产品类别入表
         ProductCategory productCategory = new ProductCategory();
         BeanUtils.copyProperties(productCategoryDTO, productCategory);
-        productCategory.setCreateId(personnelVO.getId());
+        productCategory.setCreateId("1");
         productCategory.setTenant(personnelVO.getTenantId());
         productCategory.insert();
         //判断可见类型：
         Integer showType = productCategoryDTO.getShowType();
         if(showType != 0 && showType != 1){
-            List<Integer> showPersonIds = productCategoryDTO.getShowPersonIds();
+            List<String> showPersonIds = productCategoryDTO.getShowPersonIds();
             //0所有人可见,1本人可见
             if(showPersonIds !=null && showPersonIds.size() != 0){
                 List<AssoProductCategoryPerson> assoProductCategoryPeople = new ArrayList<>();
-                for (Integer showPersonId : showPersonIds) {
+                for (String showPersonId : showPersonIds) {
                     AssoProductCategoryPerson assoProductCategoryPerson = new AssoProductCategoryPerson();
                     assoProductCategoryPerson.setProductCategoryId(productCategory.getId());
                     assoProductCategoryPerson.setPersonId(showPersonId);
-                    assoProductCategoryPerson.setCreateId(personnelVO.getId());
+                    assoProductCategoryPerson.setCreateId(personnelVO.getGuid());
                     //2仅选定人可见
                     if (showType == 2) {
                         assoProductCategoryPerson.setRole(1);
@@ -162,7 +172,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
                     AssoProductCategoryFile assoProductCategoryFile = new AssoProductCategoryFile();
                     assoProductCategoryFile.setProductCategoryId(productCategory.getId());
                     assoProductCategoryFile.setFileGuid(item);
-                    assoProductCategoryFile.setCreateId(personnelVO.getId());
+                    assoProductCategoryFile.setCreateId(personnelVO.getGuid());
                     assoProductCategoryFiles.add(assoProductCategoryFile);
                 }
                 if (assoProductCategoryFiles != null && assoProductCategoryFiles.size() != 0) {
@@ -267,7 +277,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
                     AssoProductCategoryFile assoProductCategoryFile = new AssoProductCategoryFile();
                     assoProductCategoryFile.setProductCategoryId(productCategory.getId());
                     assoProductCategoryFile.setFileGuid(item);
-                    assoProductCategoryFile.setCreateId(personnelVO.getId());
+                    assoProductCategoryFile.setCreateId(personnelVO.getGuid());
                     assoProductCategoryFiles.add(assoProductCategoryFile);
                 }
                 if (assoProductCategoryFiles != null && assoProductCategoryFiles.size() != 0) {
@@ -285,8 +295,13 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         return null;
     }
 
+    /**
+     * 装载产品类别
+     * @param productCategoryVOS
+     * @throws IOException
+     */
     private void loadProductCategory(List<ProductCategoryVO> productCategoryVOS) throws IOException {
-        List<Integer> createIds = new ArrayList<>();
+        List<String> createIds = new ArrayList<>();
         List<Integer> ids = new ArrayList<>();
         productCategoryVOS.forEach(
                 item -> {
@@ -329,7 +344,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         //装载信息
         for (ProductCategoryVO productCategoryVO:productCategoryVOS) {
             //装载人员信息
-            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(productCategoryVO.getCreateId())).findFirst().orElse(null);
+            Personnel personnel = personnels.stream().filter(item -> item.getGuid().equals(productCategoryVO.getCreateId())).findFirst().orElse(null);
             if(personnel != null){
                 productCategoryVO.setCreateName(personnel.getPersonnelName());
             }

src/main/java/cn/cslg/pas/service/business/ProductService.java

@@ -8,6 +8,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.business.ProductVO;
 import cn.cslg.pas.domain.business.AssoProductFile;
+import cn.cslg.pas.domain.business.AssoProductPerson;
 import cn.cslg.pas.domain.business.Product;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
@@ -61,18 +62,36 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
     @Autowired
     private ProductMapper productMapper;
 
+    @Autowired
+    private AssoProductPersonService assoProductPersonService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
-        List<String> sqls = formatQueryService.reSqls(queryRequest,"");
+        List<String> sqls = formatQueryService.reSqls(queryRequest,"product");
         //根据sql查询产品信息
         List<ProductVO> productVOS = productMapper.getProduct(sqls.get(0), sqls.get(1), sqls.get(2));
+        //遍历查询出来的产品
+        productVOS.forEach(item -> {
+            //根据showType到产品与可见人员关联表中查询可见人员
+            Integer showType = item.getShowType();
+            if(showType == 2 && showType == 3){
+                LambdaQueryWrapper<AssoProductPerson> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(AssoProductPerson::getProductId, item.getId());
+                queryWrapper.eq(AssoProductPerson::getRole, showType);
+                List<AssoProductPerson> assoProductPeople = assoProductPersonService.list(queryWrapper);
+                List<String> showPersonIds = assoProductPeople.stream().map(AssoProductPerson::getPersonId).collect(Collectors.toList());
+                item.setShowPersonIds(showPersonIds);
+            }
+        });
+        //查询总数
+        Long total = productMapper.getProductCount(sqls.get(0));
         this.loadProduct(productVOS);
         Records records = new Records();
         records.setCurrent(queryRequest.getCurrent());
         records.setSize(queryRequest.getSize());
         records.setData(productVOS);
-//        records.setTotal();
+        records.setTotal(total);
         return records;
     }
 
@@ -104,6 +123,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
         //产品入库
         Product product = new Product();
         BeanUtils.copyProperties(productDTO, product);
+        //TODO
+        product.setCreateId(null);
+        product.setTenantId(personnelVO.getTenantId());
         product.insert();
         if(files != null && files.size() != 0) {
             try {
@@ -113,7 +135,8 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
                     AssoProductFile assoProductFile = new AssoProductFile();
                     assoProductFile.setProductId(product.getId());
                     assoProductFile.setFileGuid(item);
-                    assoProductFile.setCreateId(personnelVO.getId());
+                    //TODO
+                    assoProductFile.setCreateId("1");
                     assoProductFiles.add(assoProductFile);
                 }
                 if (assoProductFiles != null && assoProductFiles.size() != 0) {
@@ -188,7 +211,8 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
                     AssoProductFile assoProductFile = new AssoProductFile();
                     assoProductFile.setProductId(product.getId());
                     assoProductFile.setFileGuid(item);
-                    assoProductFile.setCreateId(personnelVO.getId());
+                    //TODO
+                    assoProductFile.setCreateId("1");
                     assoProductFiles.add(assoProductFile);
                 }
                 if (assoProductFiles != null && assoProductFiles.size() != 0) {
@@ -212,7 +236,7 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
      * @throws IOException
      */
     private void loadProduct(List<ProductVO> productVOS) throws IOException {
-        List<Integer> createIds = new ArrayList<>();
+        List<String> createIds = new ArrayList<>();
         List<Integer> ids = new ArrayList<>();
         productVOS.forEach(
                 item -> {

src/main/java/cn/cslg/pas/service/business/TreeNodeService.java

@@ -20,7 +20,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.antlr.v4.runtime.tree.Tree;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -106,7 +105,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //赋值
         TreeNode treeNode = new TreeNode();
         BeanUtils.copyProperties(treeNodeDTO, treeNode);
-        treeNode.setCreateId(personnelVO.getId());
+        treeNode.setCreateId("1");
         //数据入表
         treeNode.insert();
         //处理文件
@@ -118,7 +117,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
                         AssoTreeNodeFile assoTreeNodeFile = new AssoTreeNodeFile();
                         assoTreeNodeFile.setTreeNodeId(treeNode.getId());
                         assoTreeNodeFile.setFileGuid(item);
-                        assoTreeNodeFile.setCreateId(personnelVO.getId());
+                        assoTreeNodeFile.setCreateId(personnelVO.getGuid());
                         assoTreeNodeFiles.add(assoTreeNodeFile);
                     }
                     if(assoTreeNodeFiles != null && assoTreeNodeFiles.size() != 0){
@@ -171,7 +170,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         } catch (Exception e) {
-            throw  new UnLoginException("未登录");
+            throw new UnLoginException("未登录");
         }
         treeNodeDTO.setName(treeNodeDTO.getName().trim());
         //根据名称查询是否重复
@@ -185,7 +184,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //赋值
         TreeNode treeNode = this.getById(treeNodeDTO.getId());
         BeanUtils.copyProperties(treeNodeDTO, treeNode);
-        treeNode.setCreateId(personnelVO.getId());
+        treeNode.setCreateId(null);
         //数据入表
         treeNode.insert();
         //处理文件
@@ -197,7 +196,8 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
                     AssoTreeNodeFile assoTreeNodeFile = new AssoTreeNodeFile();
                     assoTreeNodeFile.setTreeNodeId(treeNode.getId());
                     assoTreeNodeFile.setFileGuid(item);
-                    assoTreeNodeFile.setCreateId(personnelVO.getId());
+                    //TODO
+                    assoTreeNodeFile.setCreateId(null);
                     assoTreeNodeFiles.add(assoTreeNodeFile);
                 }
                 if(assoTreeNodeFiles != null && assoTreeNodeFiles.size() != 0){
@@ -217,7 +217,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     }
 
     private void loadTreeNode(List<TreeNodeVO> treeNodeVOS) throws IOException {
-        List<Integer> createIds = new ArrayList<>();
+        List<String> createIds = new ArrayList<>();
         List<Integer> ids = new ArrayList<>();
         treeNodeVOS.forEach(
                 item -> {
@@ -261,10 +261,11 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //装载信息
         for(TreeNodeVO treeNodeVO:treeNodeVOS){
             //装载人员信息
-            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(treeNodeVO.getCreateId())).findFirst().orElse(null);
-            if(personnel != null){
-                treeNodeVO.setCreateName(personnel.getPersonnelName());
-            }
+            //TODO
+//            Personnel personnel = personnels.stream().filter(item -> item.getId().equals(treeNodeVO.getCreateId())).findFirst().orElse(null);
+//            if(personnel != null){
+//                treeNodeVO.setCreateName(personnel.getPersonnelName());
+//            }
             //装载文件信息
             List<AssoTreeNodeFile> assoTreeNodeFilesTemp = assoTreeNodeFiles.stream().filter(item -> item.getTreeNodeId().equals(treeNodeVO.getId())).collect(Collectors.toList());
             if(assoTreeNodeFilesTemp.size() != 0){