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/MouldFileServiceImpl.java

@@ -392,10 +392,25 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         List<MouldFile> list = mouldFileMapper.selectList(new QueryWrapper<MouldFile>().eq("model_id", mouldId).eq("blong_type", blongType).orderByDesc("id"));
+//        if(){
+//
+//        }
         msg.data = list;
         return msg;
     }
 
+    public List<Integer> recursion(int mouldId,List<Integer> list){
+        Mould mould = null;
+        mould = mouldMapper.selectById(mouldId);
+        if(mould != null){
+            list.add(mould.getId());
+            if(mould.getPreUpdateId() != 0){
+                recursion(mould.getPreUpdateId(),list);
+            }
+        }
+        return list;
+    }
+
     @Override
     public HttpRespMsg delFile(MouldFile mouldFile) {
         HttpRespMsg msg = new HttpRespMsg();

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

@@ -98,7 +98,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 } else {
                     QueryWrapper<Project> qwPro = new QueryWrapper<>();
                     qwPro.eq("manager_id", user.getId());
-                    List<Project> projectList = projectMapper.selectList(qw);
+                    List<Project> projectList = projectMapper.selectList(qwPro);
                     for (Project project : projectList) {
                         set.add(project.getId());
                     }