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

@@ -148,12 +148,13 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public HttpRespMsg getCoutomCompanyAndMouldsByUser(UserVO userVO) {
         HttpRespMsg msg = new HttpRespMsg();
         List<CompanyVO> companyVOS = new ArrayList<>();
+        List<Integer> mouldIds = new ArrayList<>();
+        mouldIds.add(-1);
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         if (Constant.SYS_ID == currentUser.getParentId()) {
             //此时是admin，可看到自己公司下的模具和交于生产的公司
             QueryWrapper<Mould> qw = new QueryWrapper<>();
             List<Mould> moulds = mouldMapper.selectList(qw.eq("company_id", currentUser.getCompanyId()));
-            List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {
                 mouldIds.add(mould.getId());
             }
@@ -161,7 +162,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         } else if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
             //系统管理员创建admin,返回资产方公司
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>());
-            List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {
                 mouldIds.add(mould.getId());
             }
@@ -193,8 +193,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
                 }
             }
             List<Mould> moulds = mouldMapper.selectList(new QueryWrapper<Mould>().in("project_id",set));
-            System.out.println(set + "_____" +  moulds);
-            List<Integer> mouldIds = new ArrayList<>();
             for (Mould mould : moulds) {
                 mouldIds.add(mould.getId());
             }

cloud-model/src/main/resources/application.properties

@@ -12,7 +12,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya10
 #spring.datasource.druid.test-on-borrow=true