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

@@ -154,13 +154,13 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         BeanUtils.copyProperties(user, userVO);
         List<Integer> set = new ArrayList<>();
         List<MouldVO> moulds = new ArrayList<>();
+        userVO.setProjectId(-1);
         if (userVO.getId() != null) {
             //资产方管理员，获取他公司下的所有模具
             if (Constant.SYS_PARENT_ID == userVO.getParentId()) {
                 //超级管理员，获取平台所有模具
                 moulds = mouldMapper.selectListByCondition(userVO);
             } else if (Constant.SYS_ID == userVO.getParentId()) {
-
                 if (Constant.ASSETS_COMPANY == userVO.getSubordinateType()) {
                     //资产方管理员
                     moulds = mouldMapper.selectListByCondition(userVO);