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

@@ -89,6 +89,10 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
         if (user.getParentId() == 0) {
             //修改设备
             MouldEquipment newMouldEquipment = mouldEquipmentMapper.selectById(mouldEquipment.getId());
+            if(null == newMouldEquipment.getBelongCompanyId()){
+                msg.setError("对不起，请添加所属公司后再启用");
+                return msg;
+            }
             newMouldEquipment.setIsUse(mouldEquipment.getIsUse());
             LocalDateTime now = LocalDateTime.now();
             newMouldEquipment.setStartTime(now);
@@ -96,6 +100,7 @@ public class MouldEquipmentServiceImpl extends ServiceImpl<MouldEquipmentMapper,
             mouldEquipmentMapper.updateById(newMouldEquipment);
         } else {
             msg.setError("对不起，您不是管理员，不具备启用设备的权限");
+            return msg;
         }
         return msg;
     }