Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/PartServiceImpl.java

@@ -76,14 +76,12 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
             // 故从第二行开始遍历拿数据（如果有标题的话，则从第三行开始拿数据）
             for (int j = 1; j < sheet.getLastRowNum() + 1; j++) {
                 XSSFRow row = sheet.getRow(j);
-                System.out.println("row====>" + row);
                 //新建零件
                 Part part = new Part();
                 part.setMouldId(mould.getId());
                 // 遍历所有的列，下面的10是excle表格里共有10列即对应了10个字段
                 for (int y = 0; y < 3; y++) {
                     XSSFCell cell = row.getCell(y);
-                    System.out.println("cell====>" + row);
                     cell.setCellType(Cell.CELL_TYPE_STRING);
                     //取出当前列的值
                     String value = cell.getStringCellValue();
@@ -117,15 +115,17 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
                 part.setCreator(user.getUsername());
                 partMapper.insert(part);
             }
-            //用完后删除临时文件
-            if (!f.isDirectory()) {
-                f.delete();
-            }
 //            } catch (Exception e) {
 //                log.error(e.getMessage(), e);
 //                msg.setError(e.getMessage());
 //                return msg;
 //            }
+            //关闭工作簿进程
+            wookbook.close();
+            //用完后删除临时文件
+            if (!f.isDirectory()) {
+                f.delete();
+            }
         } else {
             msg.setError("用户不存在或者未登录");
         }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/UserServiceImpl.java

@@ -342,10 +342,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 int count = userMapper.selectCount(qw);
                 if (count > 0) {
                     User existingUser = userMapper.selectOne(qw);
-                    List<Integer> uids = userMapper.selectList(new QueryWrapper<User>().eq("parent_id", parentUser.getId())).stream().map(User::getId).collect(Collectors.toList());
-                    uids.add(-1);
-                    Integer countUser = userMapper.selectCount(new QueryWrapper<User>().in("parent_id", uids));
-                    if (existingUser.getParentId() == parentUser.getId()||countUser>0) {
+                    List<Integer> pIds  = projectMapper.selectList(new QueryWrapper<Project>().eq("owner_company", parentUser.getCompanyId())).stream().map(Project::getId).collect(Collectors.toList());
+                    pIds.add(-1);
+                    List<Integer> managerIds = projectMapper.selectList(new QueryWrapper<Project>().eq("owner_company", parentUser.getCompanyId())).stream().map(Project::getManagerId).collect(Collectors.toList());
+                    List<Integer> usersIds = projectUserMapper.selectList(new QueryWrapper<ProjectUser>().in("project_id", pIds)).stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+                    List<Integer> projectApproveIds = projectApproveMapper.selectList(new QueryWrapper<ProjectApprove>().in("project_id", pIds)).stream().map(ProjectApprove::getApproverId).collect(Collectors.toList());
+                    usersIds.add(-1);
+                    usersIds.addAll(managerIds);
+                    usersIds.addAll(projectApproveIds);
+//                    if (usersIds.contains(existingUser.getId())) {
+//                        msg.setError("该账号已参与本资产方公司下的其他项目，请前往本项目详情添加即可");
+//                        return msg;
+//                    }
+//                    List<Integer> uids = userMapper.selectList(new QueryWrapper<User>().eq("parent_id", parentUser.getId())).stream().map(User::getId).collect(Collectors.toList());
+//                    uids.add(-1);
+//                    Integer countUser = userMapper.selectCount(new QueryWrapper<User>().in("parent_id", uids));
+                    if (usersIds.contains(existingUser.getId())) {
                         msg.setError("该账号已存在，请勿重新创建");
                         return msg;
                     } else {